Commit 1ddcdb7c authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu: use psp_execute_load_ip_fw instead 



Replace the old ones with psp_execute_load_ip_fw.

Suggested-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 45b51acb

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

+0 −13
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -1239,3 +1239,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);