drm/amdgpu: asd function needs to be unloaded in suspend phase
Subsystems (2)
PATCH 1/2 drm/amdgpu: asd function needs to be unloaded in suspend phase
Unload ASD function in suspend phase.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +6 -0
@@ -1933,6 +1933,12 @@ static int psp_suspend(void *handle) } } + ret =psp_asd_unload (psp); +if (ret) { +DRM_ERROR ("Failed to unload asd\n" ); +return ret; + } + ret =psp_ring_stop (psp,PSP_RING_TYPE__KM );if (ret) {DRM_ERROR ("PSP ring stop failed\n" );
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 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.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 57 +++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +53 -4
@@ -430,6 +430,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) {
@@ -1866,8 +1912,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;int ret;if (psp->adev->psp.ta_fw) {
@@ -1883,10 +1927,9 @@ static int psp_hw_fini(void *handle)return ret; } +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,
@@ -1939,6 +1982,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" );
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amdgpu: add TMR destory function for psp
[AMD Public Use]
Series is:
________________________________
From: amd-gfx <[email protected]> on behalf of Huang Rui <[email protected]>
Sent: Tuesday, June 30, 2020 6:30 AM
To: [email protected] <[email protected]>
Cc: Huang, Ray <[email protected]>
Subject: [PATCH 2/2] 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.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 57 +++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +53 -4
@@ -430,6 +430,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) {
@@ -1866,8 +1912,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;int ret;if (psp->adev->psp.ta_fw) {
@@ -1883,10 +1927,9 @@ static int psp_hw_fini(void *handle)return ret; } +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,
@@ -1939,6 +1982,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" );
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7C282cd5829fbe4fca8ac708d81ce0cdbb%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637291099162588481&sdata=UfOBa7Xaa6qvWClFnYB4OSngc8k0YyUmDCwtKmZ5BQQ%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx