[PATCH 2/2] drm/amdgpu: use psp_execute_load_ip_fw instead
Lazar, Lijo
lijo.lazar at amd.com
Mon Jul 10 04:12:44 UTC 2023
On 7/10/2023 8:40 AM, Lang Yu wrote:
> Replace the old ones with psp_execute_load_ip_fw.
>
> Suggested-by: Lijo Lazar <lijo.lazar at amd.com>
> Signed-off-by: Lang Yu <Lang.Yu at amd.com>
Series is -
Reviewed-by: Lijo Lazar <lijo.lazar at amd.com>
Thanks,
Lijo
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 13 -------------
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 --
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 15 +++++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 +++
> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +---
> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +---
> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +---
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 4 +---
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 4 +---
> 9 files changed, 23 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index a1a4408e524d..1b4d5f04d968 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -2920,19 +2920,6 @@ int psp_rlc_autoload_start(struct psp_context *psp)
> return ret;
> }
>
> -int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
> - uint64_t cmd_gpu_addr, int cmd_size)
> -{
> - struct amdgpu_firmware_info ucode = {0};
> -
> - ucode.ucode_id = inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM :
> - AMDGPU_UCODE_ID_VCN0_RAM;
> - ucode.mc_addr = cmd_gpu_addr;
> - ucode.ucode_size = cmd_size;
> -
> - return psp_execute_ip_fw_load(&adev->psp, &ucode);
> -}
> -
> int psp_ring_cmd_submit(struct psp_context *psp,
> uint64_t cmd_buf_mc_addr,
> uint64_t fence_mc_addr,
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> index efb3972bfebd..c3203de4a007 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> @@ -466,8 +466,6 @@ int psp_execute_ip_fw_load(struct psp_context *psp,
> struct amdgpu_firmware_info *ucode);
>
> int psp_gpu_reset(struct amdgpu_device *adev);
> -int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
> - uint64_t cmd_gpu_addr, int cmd_size);
>
> int psp_ta_init_shared_buf(struct psp_context *psp,
> struct ta_mem_context *mem_ctx);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index d37ebd4402ef..4e1256af80b6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -1257,3 +1257,18 @@ int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev)
>
> return 0;
> }
> +
> +int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx,
> + enum AMDGPU_UCODE_ID ucode_id)
> +{
> + struct amdgpu_firmware_info ucode = {
> + .ucode_id = (ucode_id ? ucode_id :
> + (inst_idx ? AMDGPU_UCODE_ID_VCN1_RAM :
> + AMDGPU_UCODE_ID_VCN0_RAM)),
> + .mc_addr = adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> + .ucode_size = ((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> + (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr),
> + };
> +
> + return psp_execute_ip_fw_load(&adev->psp, &ucode);
> +}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> index 92d5534df5f4..1f1d7dc94f90 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> @@ -414,4 +414,7 @@ int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev,
> struct ras_common_if *ras_block);
> int amdgpu_vcn_ras_sw_init(struct amdgpu_device *adev);
>
> +int amdgpu_vcn_psp_update_sram(struct amdgpu_device *adev, int inst_idx,
> + enum AMDGPU_UCODE_ID ucode_id);
> +
> #endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index c975aed2f6c7..18794394c5a0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -881,9 +881,7 @@ static int vcn_v2_0_start_dpg_mode(struct amdgpu_device *adev, bool indirect)
> UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
>
> if (indirect)
> - psp_update_vcn_sram(adev, 0, adev->vcn.inst->dpg_sram_gpu_addr,
> - (uint32_t)((uintptr_t)adev->vcn.inst->dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst->dpg_sram_cpu_addr));
> + amdgpu_vcn_psp_update_sram(adev, 0, 0);
>
> /* force RBC into idle state */
> rb_bufsz = order_base_2(ring->ring_size);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index bb1875f926f1..6fbea38f4d3e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -912,9 +912,7 @@ static int vcn_v2_5_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
> UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
>
> if (indirect)
> - psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> - (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
> + amdgpu_vcn_psp_update_sram(adev, inst_idx, 0);
>
> ring = &adev->vcn.inst[inst_idx].ring_dec;
> /* force RBC into idle state */
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> index c8f63b3c6f69..b76ba21b5a89 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> @@ -1037,9 +1037,7 @@ static int vcn_v3_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
> VCN, inst_idx, mmUVD_VCPU_CNTL), tmp, 0, indirect);
>
> if (indirect)
> - psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> - (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
> + amdgpu_vcn_psp_update_sram(adev, inst_idx, 0);
>
> ring = &adev->vcn.inst[inst_idx].ring_dec;
> /* force RBC into idle state */
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> index d96ff4acae35..e8c02ae10163 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> @@ -993,9 +993,7 @@ static int vcn_v4_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, boo
>
>
> if (indirect)
> - psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> - (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
> + amdgpu_vcn_psp_update_sram(adev, inst_idx, 0);
>
> ring = &adev->vcn.inst[inst_idx].ring_enc[0];
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> index 5d67b8b8a3d6..550ac040b4be 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> @@ -778,9 +778,7 @@ static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b
> UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);
>
> if (indirect)
> - psp_update_vcn_sram(adev, 0, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,
> - (uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -
> - (uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));
> + amdgpu_vcn_psp_update_sram(adev, inst_idx, AMDGPU_UCODE_ID_VCN0_RAM);
>
> ring = &adev->vcn.inst[inst_idx].ring_enc[0];
>
More information about the amd-gfx
mailing list