drm/amdgpu: load np fw prior before loading the TAs

Platform TAs will independently toggle DF Cstate.
for instance, get/set topology from xgmi ta. do error
injection from ras ta. In such case, PMFW needs to be
loaded before TAs so that all the subsequent Cstate
calls recieved by PSP FW can be routed to PMFW.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 6ff5e78bf80b618f76b8d89e095bb74feceb6515..c84529718bcb233ae4d4a4adab7879cc538c57c2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -1231,39 +1231,6 @@ static int psp_hw_start(struct psp_context *psp)
                return ret;
        }
 
-       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");
-       }
-
        return 0;
 }
 
@@ -1579,6 +1546,39 @@ static int psp_load_fw(struct amdgpu_device *adev)
        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");
+       }
+
        return 0;
 
 failed: