drm/amdgpu: fix resume failures casued by psp fw loading sequence change
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix resume failures casued by psp fw loading sequence change
this fix the regression caused by asd/ta loading sequence adjustment recently. asd/ta loading was move out from hw_start and should also be applied to psp_resume. otherwise those fw loading will be ignored in resume phase.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +33 -0
@@ -1702,6 +1702,39 @@ static int psp_resume(void *handle)if (ret) goto failed; + ret =psp_asd_load (psp); +if (ret) { +DRM_ERROR ("PSP load asd failed!\n" ); +return ret; + } + +if (adev->gmc.xgmi.num_physical_nodes >1 ) { + ret =psp_xgmi_initialize (psp); +/* Warning the XGMI seesion initialize failure +* Instead of stop driver initialization +*/ +if (ret) +dev_err (psp->adev->dev, +"XGMI: Failed to initialize XGMI session\n" ); + } + +if (psp->adev->psp.ta_fw) { + ret =psp_ras_initialize (psp); +if (ret) +dev_err (psp->adev->dev, +"RAS: Failed to initialize RAS\n" ); + + ret =psp_hdcp_initialize (psp); +if (ret) +dev_err (psp->adev->dev, +"HDCP: Failed to initialize HDCP\n" ); + + ret =psp_dtm_initialize (psp); +if (ret) +dev_err (psp->adev->dev, +"DTM: Failed to initialize DTM\n" ); + } +mutex_unlock (&adev->firmware.mutex);return 0 ;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Hawking Zhang
Sent: Friday, December 6, 2019 5:00 PM
To: [email protected]; Ma, Le <[email protected]>; Clements, John <[email protected]>; Deucher, Alexander <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: fix resume failures casued by psp fw loading sequence change
this fix the regression caused by asd/ta loading sequence adjustment recently. asd/ta loading was move out from hw_start and should also be applied to psp_resume. otherwise those fw loading will be ignored in resume phase.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -0
@@ -1702,6 +1702,39 @@ static int psp_resume(void *handle)if (ret) goto failed; + ret =psp_asd_load (psp); +if (ret) { +DRM_ERROR ("PSP load asd failed!\n" ); +return ret;
[Guchun] We can't directly return here, as at the early stage of this function psp_resume, we have enabled lock. We need to use goto failed to unlock, like other failure case.
+ }
+
+ if (adev->gmc.xgmi.num_physical_nodes > 1) {
+ ret = psp_xgmi_initialize(psp);
+ /* Warning the XGMI seesion initialize failure
+ * Instead of stop driver initialization
+ */
+ if (ret)
+ dev_err(psp->adev->dev,
+ "XGMI: Failed to initialize XGMI session\n");
+ }
+
+ if (psp->adev->psp.ta_fw) {
+ ret = psp_ras_initialize(psp);
+ if (ret)
+ dev_err(psp->adev->dev,
+ "RAS: Failed to initialize RAS\n");
+
+ ret = psp_hdcp_initialize(psp);
+ if (ret)
+ dev_err(psp->adev->dev,
+ "HDCP: Failed to initialize HDCP\n");
+
+ ret = psp_dtm_initialize(psp);
+ if (ret)
+ dev_err(psp->adev->dev,
+ "DTM: Failed to initialize DTM\n");
+ }
+
mutex_unlock(&adev->firmware.mutex);
return 0;
--
2.17.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%7Cguchun.chen%40amd.com%7Cb6ca6382dad04259db0b08d77a2ab835%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637112196257885839&sdata=IbufAVAS4v774A37vlnn2JKvpjnlmB9rHzG%2FZyddyLs%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Good point. Please check v2.
Regards,
Hawking
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: 2019年12月6日 17:04
To: Zhang, Hawking <[email protected]>; [email protected]; Ma, Le <[email protected]>; Clements, John <[email protected]>; Deucher, Alexander <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: fix resume failures casued by psp fw loading sequence change
[AMD Public Use]
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Hawking Zhang
Sent: Friday, December 6, 2019 5:00 PM
To: [email protected]; Ma, Le <[email protected]>; Clements, John <[email protected]>; Deucher, Alexander <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: fix resume failures casued by psp fw loading sequence change
this fix the regression caused by asd/ta loading sequence adjustment recently. asd/ta loading was move out from hw_start and should also be applied to psp_resume. otherwise those fw loading will be ignored in resume phase.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -0
@@ -1702,6 +1702,39 @@ static int psp_resume(void *handle)if (ret) goto failed; + ret =psp_asd_load (psp); +if (ret) { +DRM_ERROR ("PSP load asd failed!\n" ); +return ret;
[Guchun] We can't directly return here, as at the early stage of this function psp_resume, we have enabled lock. We need to use goto failed to unlock, like other failure case.
+ }
+
+ if (adev->gmc.xgmi.num_physical_nodes > 1) {
+ ret = psp_xgmi_initialize(psp);
+ /* Warning the XGMI seesion initialize failure
+ * Instead of stop driver initialization
+ */
+ if (ret)
+ dev_err(psp->adev->dev,
+ "XGMI: Failed to initialize XGMI session\n");
+ }
+
+ if (psp->adev->psp.ta_fw) {
+ ret = psp_ras_initialize(psp);
+ if (ret)
+ dev_err(psp->adev->dev,
+ "RAS: Failed to initialize RAS\n");
+
+ ret = psp_hdcp_initialize(psp);
+ if (ret)
+ dev_err(psp->adev->dev,
+ "HDCP: Failed to initialize HDCP\n");
+
+ ret = psp_dtm_initialize(psp);
+ if (ret)
+ dev_err(psp->adev->dev,
+ "DTM: Failed to initialize DTM\n");
+ }
+
mutex_unlock(&adev->firmware.mutex);
return 0;
--
2.17.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%7Cguchun.chen%40amd.com%7Cb6ca6382dad04259db0b08d77a2ab835%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637112196257885839&sdata=IbufAVAS4v774A37vlnn2JKvpjnlmB9rHzG%2FZyddyLs%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx