Commit 77ec28ea authored by Candice Li's avatar Candice Li Committed by Alex Deucher
Browse files

drm/amdgpu: Update PSP TA Invoke to use common TA context as input 



Updated invoke to use new common TA structure similarily to load/unload.

Signed-off-by: default avatarCandice Li <candice.li@amd.com>
Reviewed-by: default avatarJohn Clements <john.clements@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a74d0224

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

+8 −8
Original line number Diff line number Diff line
@@ -938,12 +938,12 @@ static void psp_prep_ta_invoke_cmd_buf(struct psp_gfx_cmd_resp *cmd, 


static int psp_ta_invoke(struct psp_context *psp,

		  uint32_t ta_cmd_id,

		  uint32_t session_id)

		  struct ta_context *context)

{

	int ret;

	struct psp_gfx_cmd_resp *cmd = acquire_psp_cmd_buf(psp);



	psp_prep_ta_invoke_cmd_buf(cmd, ta_cmd_id, session_id);

	psp_prep_ta_invoke_cmd_buf(cmd, ta_cmd_id, context->session_id);



	ret = psp_cmd_submit_buf(psp, NULL, cmd,

				 psp->fence_buf_mc_addr);
@@ -989,7 +989,7 @@ static int psp_xgmi_unload(struct psp_context *psp) 


int psp_xgmi_invoke(struct psp_context *psp, uint32_t ta_cmd_id)

{

	return psp_ta_invoke(psp, ta_cmd_id, psp->xgmi_context.context.session_id);

	return psp_ta_invoke(psp, ta_cmd_id, &psp->xgmi_context.context);

}



int psp_xgmi_terminate(struct psp_context *psp)
@@ -1291,7 +1291,7 @@ int psp_ras_invoke(struct psp_context *psp, uint32_t ta_cmd_id) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	ret = psp_ta_invoke(psp, ta_cmd_id, psp->ras_context.context.session_id);

	ret = psp_ta_invoke(psp, ta_cmd_id, &psp->ras_context.context);



	if (amdgpu_ras_intr_triggered())

		return ret;
@@ -1551,7 +1551,7 @@ int psp_hdcp_invoke(struct psp_context *psp, uint32_t ta_cmd_id) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	return psp_ta_invoke(psp, ta_cmd_id, psp->hdcp_context.context.session_id);

	return psp_ta_invoke(psp, ta_cmd_id, &psp->hdcp_context.context);

}



static int psp_hdcp_terminate(struct psp_context *psp)
@@ -1643,7 +1643,7 @@ int psp_dtm_invoke(struct psp_context *psp, uint32_t ta_cmd_id) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	return psp_ta_invoke(psp, ta_cmd_id, psp->dtm_context.context.session_id);

	return psp_ta_invoke(psp, ta_cmd_id, &psp->dtm_context.context);

}



static int psp_dtm_terminate(struct psp_context *psp)
@@ -1777,7 +1777,7 @@ int psp_rap_invoke(struct psp_context *psp, uint32_t ta_cmd_id, enum ta_rap_stat 
	rap_cmd->cmd_id = ta_cmd_id;

	rap_cmd->validation_method_id = METHOD_A;



	ret = psp_ta_invoke(psp, rap_cmd->cmd_id, psp->rap_context.context.session_id);

	ret = psp_ta_invoke(psp, rap_cmd->cmd_id, &psp->rap_context.context);

	if (ret)

		goto out_unlock;
@@ -1899,7 +1899,7 @@ int psp_securedisplay_invoke(struct psp_context *psp, uint32_t ta_cmd_id) 


	mutex_lock(&psp->securedisplay_context.mutex);



	ret = psp_ta_invoke(psp, ta_cmd_id, psp->securedisplay_context.context.session_id);

	ret = psp_ta_invoke(psp, ta_cmd_id, &psp->securedisplay_context.context);



	mutex_unlock(&psp->securedisplay_context.mutex);