drm/amdgpu: correct RLC firmwares loading sequence
Subsystems (2)
PATCH 1/1 drm/amdgpu: correct RLC firmwares loading sequence
Per confirmation with RLC firmware team, the RLC should be unhalted after all RLC related firmwares uploaded. However, in fact the RLC is unhalted immediately after RLCG firmware uploaded. And that may causes unexpected PSP hang on loading the succeeding RLC save restore list related firmwares.
So, we correct the firmware loading sequence to load RLC save restore list related firmwares before RLCG ucode. That will help to get around this issue.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -1
@@ -1466,7 +1466,7 @@ static int psp_np_fw_load(struct psp_context *psp)/* Start rlc autoload after psp recieved all the gfx firmware */ if (psp->autoload_supported && ucode->ucode_id == (amdgpu_sriov_vf (adev) ? -AMDGPU_UCODE_ID_CP_MEC2 :AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM )) { +AMDGPU_UCODE_ID_CP_MEC2 :AMDGPU_UCODE_ID_RLC_G )) { ret =psp_rlc_autoload (psp);if (ret) {DRM_ERROR ("Failed to start rlc autoload\n" );
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +1 -1
@@ -300,10 +300,10 @@ enum AMDGPU_UCODE_ID {AMDGPU_UCODE_ID_CP_MEC2_JT ,AMDGPU_UCODE_ID_CP_MES ,AMDGPU_UCODE_ID_CP_MES_DATA , -AMDGPU_UCODE_ID_RLC_G ,AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL ,AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM ,AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM , +AMDGPU_UCODE_ID_RLC_G ,AMDGPU_UCODE_ID_STORAGE ,AMDGPU_UCODE_ID_SMC , AMDGPU_UCODE_ID_UVD,
Signature · 6 lines
2.24.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
Regards,
Hawking
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Wednesday, December 25, 2019 14:23
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH] drm/amdgpu: correct RLC firmwares loading sequence
Per confirmation with RLC firmware team, the RLC should be unhalted after all RLC related firmwares uploaded.
However, in fact the RLC is unhalted immediately after RLCG firmware uploaded. And that may causes unexpected PSP hang on loading the succeeding RLC save restore list related firmwares. So, we correct the firmware loading sequence to load RLC save restore list related firmwares before RLCG ucode. That will help to get around this issue.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -1
@@ -1466,7 +1466,7 @@ static int psp_np_fw_load(struct psp_context *psp)/* Start rlc autoload after psp recieved all the gfx firmware */ if (psp->autoload_supported && ucode->ucode_id == (amdgpu_sriov_vf (adev) ? -AMDGPU_UCODE_ID_CP_MEC2 :AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM )) { +AMDGPU_UCODE_ID_CP_MEC2 :AMDGPU_UCODE_ID_RLC_G )) { ret =psp_rlc_autoload (psp);if (ret) { DRM_ERROR("Failed to start rlc autoload\n"); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
index eaf2d5b9c92f..b0e656409c03 100644
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +1 -1
@@ -300,10 +300,10 @@ enum AMDGPU_UCODE_ID {AMDGPU_UCODE_ID_CP_MEC2_JT ,AMDGPU_UCODE_ID_CP_MES ,AMDGPU_UCODE_ID_CP_MES_DATA , -AMDGPU_UCODE_ID_RLC_G ,AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL ,AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM ,AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM , +AMDGPU_UCODE_ID_RLC_G ,AMDGPU_UCODE_ID_STORAGE ,AMDGPU_UCODE_ID_SMC , AMDGPU_UCODE_ID_UVD,
--
2.24.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx