drm/amdgpu: skip load cp gfx firmware for Arcturus

Arcturus has no CPG component any more.

Signed-off-by: Le Ma <le.ma@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 609678d2d264f4c6b417e1647e03b617dfd1f906..8f466282c6c538893b8f5a06ead325a08f4b68be 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -945,9 +945,12 @@ static int gfx_v9_0_init_microcode(struct amdgpu_device *adev)
                BUG();
        }
 
-       r = gfx_v9_0_init_cp_gfx_microcode(adev, chip_name);
-       if (r)
-               return r;
+       /* No CPG in Arcturus */
+       if (adev->asic_type != CHIP_ARCTURUS) {
+               r = gfx_v9_0_init_cp_gfx_microcode(adev, chip_name);
+               if (r)
+                       return r;
+       }
 
        r = gfx_v9_0_init_rlc_microcode(adev, chip_name);
        if (r)
@@ -3323,10 +3326,12 @@ static int gfx_v9_0_cp_resume(struct amdgpu_device *adev)
                gfx_v9_0_enable_gui_idle_interrupt(adev, false);
 
        if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
-               /* legacy firmware loading */
-               r = gfx_v9_0_cp_gfx_load_microcode(adev);
-               if (r)
-                       return r;
+               if (adev->asic_type != CHIP_ARCTURUS) {
+                       /* legacy firmware loading */
+                       r = gfx_v9_0_cp_gfx_load_microcode(adev);
+                       if (r)
+                               return r;
+               }
 
                r = gfx_v9_0_cp_compute_load_microcode(adev);
                if (r)