drm/amdgpu: rename psp_execute_non_psp_fw_load and make it global
Subsystems (2)
PATCH 1/2 drm/amdgpu: rename psp_execute_non_psp_fw_load and make it global
This will make this function more general, and then serve other IPs.
Suggested-by Lijo Lazar <[email protected]>
Signed-off-by Lang Yu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +6 -6
@@ -2448,8 +2448,8 @@ static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode,return ret; } -static int psp_execute_non_psp_fw_load (struct psp_context *psp, -struct amdgpu_firmware_info *ucode) +int psp_execute_ip_fw_load (struct psp_context *psp, +struct amdgpu_firmware_info *ucode) {int ret =0 ;struct psp_gfx_cmd_resp *cmd =acquire_psp_cmd_buf (psp);
@@ -2492,7 +2492,7 @@ static int psp_load_smu_fw(struct psp_context *psp)DRM_WARN ("Failed to set MP1 state prepare for reload\n" ); } - ret =psp_execute_non_psp_fw_load (psp, ucode); + ret =psp_execute_ip_fw_load (psp, ucode);if (ret)DRM_ERROR ("PSP load smu failed!\n" );
@@ -2534,7 +2534,7 @@ int psp_load_fw_list(struct psp_context *psp,for (i =0 ; i < ucode_count; ++i) { ucode = ucode_list[i];psp_print_fw_hdr (psp, ucode); - ret =psp_execute_non_psp_fw_load (psp, ucode); + ret =psp_execute_ip_fw_load (psp, ucode);if (ret)return ret; }
@@ -2581,7 +2581,7 @@ static int psp_load_non_psp_fw(struct psp_context *psp)psp_print_fw_hdr (psp, ucode); - ret =psp_execute_non_psp_fw_load (psp, ucode); + ret =psp_execute_ip_fw_load (psp, ucode);if (ret)return ret;
@@ -2930,7 +2930,7 @@ int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx, ucode.mc_addr = cmd_gpu_addr; ucode.ucode_size = cmd_size; -return psp_execute_non_psp_fw_load (&adev->psp, &ucode); +return psp_execute_ip_fw_load (&adev->psp, &ucode); } int psp_ring_cmd_submit(struct psp_context *psp,
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +3 -0
@@ -462,6 +462,9 @@ extern int psp_wait_for(struct psp_context *psp, uint32_t reg_index,extern int psp_wait_for_spirom_update (struct psp_context *psp,uint32_t reg_index,uint32_t field_val,uint32_t mask,uint32_t msec_timeout); +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);
Signature · 1 line
2.25.1
PATCH 2/2 drm/amdgpu: use psp_execute_load_ip_fw instead
Replace the old ones with psp_execute_load_ip_fw.
Suggested-by Lijo Lazar <[email protected]>
Signed-off-by Lang Yu <[email protected]>
--- 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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -13
@@ -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,
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -2
@@ -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);
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +15 -0
@@ -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); +}
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +3 -0
@@ -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
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1 -3
@@ -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);
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -3
@@ -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 */
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1 -3
@@ -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 */
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +1 -3
@@ -993,9 +993,7 @@ static int vcn_v4_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, booif (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 ];
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +1 -3
@@ -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 ];
Signature · 1 line
2.25.1
Re: [PATCH 2/2] drm/amdgpu: use psp_execute_load_ip_fw instead
Quoted 4 lines · Lang Yu
Replace the old ones with
psp_execute_load_ip_fw.Suggested-by Lijo Lazar <[email protected]>Signed-off-by Lang Yu <[email protected]>
Series is -
Reviewed-by Lijo Lazar <[email protected]>
Thanks,
Lijo
Quoted 159 lines
--- 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(-)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0
-13@@ -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,drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0
-2@@ -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);drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +15
-0@@ -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); +}drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +3
-0@@ -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 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +1
-3@@ -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);drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1
-3@@ -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 */ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +1
-3@@ -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 */ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +1
-3@@ -993,9 +993,7 @@ static int vcn_v4_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, booif (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 ];drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +1
-3@@ -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 ];