Commit c564b860 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: add TMR destory function for psp 



TMR is required to be destoried with GFX_CMD_ID_DESTROY_TMR while the
system goes to suspend. Otherwise, PSP may return the failure state
(0xFFFF007) on Gfx-2-PSP command GFX_CMD_ID_SETUP_TMR after do multiple
times suspend/resume.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 20303ec5

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

+53 −4
Original line number Diff line number Diff line
@@ -372,6 +372,52 @@ static int psp_tmr_load(struct psp_context *psp) 
	return ret;

}



static void psp_prep_tmr_unload_cmd_buf(struct psp_context *psp,

					struct psp_gfx_cmd_resp *cmd)

{

	if (amdgpu_sriov_vf(psp->adev))

		cmd->cmd_id = GFX_CMD_ID_DESTROY_VMR;

	else

		cmd->cmd_id = GFX_CMD_ID_DESTROY_TMR;

}



static int psp_tmr_unload(struct psp_context *psp)

{

	int ret;

	struct psp_gfx_cmd_resp *cmd;



	cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);

	if (!cmd)

		return -ENOMEM;



	psp_prep_tmr_unload_cmd_buf(psp, cmd);

	DRM_INFO("free PSP TMR buffer\n");



	ret = psp_cmd_submit_buf(psp, NULL, cmd,

				 psp->fence_buf_mc_addr);



	kfree(cmd);



	return ret;

}



static int psp_tmr_terminate(struct psp_context *psp)

{

	int ret;

	void *tmr_buf;

	void **pptr;



	ret = psp_tmr_unload(psp);

	if (ret)

		return ret;



	/* free TMR memory buffer */

	pptr = amdgpu_sriov_vf(psp->adev) ? &tmr_buf : NULL;

	amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, pptr);



	return 0;

}



static void psp_prep_asd_load_cmd_buf(struct psp_gfx_cmd_resp *cmd,

				uint64_t asd_mc, uint32_t size)

{
@@ -1779,8 +1825,6 @@ static int psp_hw_fini(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct psp_context *psp = &adev->psp;

	void *tmr_buf;

	void **pptr;



	if (psp->adev->psp.ta_fw) {

		psp_ras_terminate(psp);
@@ -1790,10 +1834,9 @@ static int psp_hw_fini(void *handle) 


	psp_asd_unload(psp);



	psp_tmr_terminate(psp);

	psp_ring_destroy(psp, PSP_RING_TYPE__KM);



	pptr = amdgpu_sriov_vf(psp->adev) ? &tmr_buf : NULL;

	amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, pptr);

	amdgpu_bo_free_kernel(&psp->fw_pri_bo,

			      &psp->fw_pri_mc_addr, &psp->fw_pri_buf);

	amdgpu_bo_free_kernel(&psp->fence_buf_bo,
@@ -1846,6 +1889,12 @@ static int psp_suspend(void *handle) 
		return ret;

	}



	ret = psp_tmr_terminate(psp);

	if (ret) {

		DRM_ERROR("Falied to terminate tmr\n");

		return ret;

	}



	ret = psp_ring_stop(psp, PSP_RING_TYPE__KM);

	if (ret) {

		DRM_ERROR("PSP ring stop failed\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE