drm/amdgpu: check SMU NULL ptr on gfx hw init

Check SMU NULL ptr before load smu fw.

Signed-off-by: Likun Gao <[email protected]>
Reviewed-by: Hawking Zhang <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 9fe20b782e88d0fe30150eab8134746a404a3096..04c5c8d257a3e48f73be948f620e2de8897f825f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -6540,14 +6540,16 @@ static int gfx_v10_0_hw_init(void *handle)
                 * loaded firstly, so in direct type, it has to load smc ucode
                 * here before rlc.
                 */
-               r = smu_load_microcode(&adev->smu);
-               if (r)
-                       return r;
+               if (adev->smu.ppt_funcs != NULL) {
+                       r = smu_load_microcode(&adev->smu);
+                       if (r)
+                               return r;
 
-               r = smu_check_fw_status(&adev->smu);
-               if (r) {
-                       pr_err("SMC firmware status is not correct\n");
-                       return r;
+                       r = smu_check_fw_status(&adev->smu);
+                       if (r) {
+                               pr_err("SMC firmware status is not correct\n");
+                               return r;
+                       }
                }
        }