drm/amdgpu: convert amdgpu_display_supported_domains() to IP versions
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 21 Jan 2022 16:18:44 +0000 (11:18 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 25 Jan 2022 23:00:36 +0000 (18:00 -0500)
Check IP versions rather than asic types.

Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

index 82011e7..6cad39c 100644 (file)
@@ -510,19 +510,24 @@ uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev,
                case CHIP_STONEY:
                        domain |= AMDGPU_GEM_DOMAIN_GTT;
                        break;
-               case CHIP_RAVEN:
-                       /* enable S/G on PCO and RV2 */
-                       if ((adev->apu_flags & AMD_APU_IS_RAVEN2) ||
-                           (adev->apu_flags & AMD_APU_IS_PICASSO))
-                               domain |= AMDGPU_GEM_DOMAIN_GTT;
-                       break;
-               case CHIP_RENOIR:
-               case CHIP_VANGOGH:
-               case CHIP_YELLOW_CARP:
-                       domain |= AMDGPU_GEM_DOMAIN_GTT;
-                       break;
-
                default:
+                       switch (adev->ip_versions[DCE_HWIP][0]) {
+                       case IP_VERSION(1, 0, 0):
+                       case IP_VERSION(1, 0, 1):
+                               /* enable S/G on PCO and RV2 */
+                               if ((adev->apu_flags & AMD_APU_IS_RAVEN2) ||
+                                   (adev->apu_flags & AMD_APU_IS_PICASSO))
+                                       domain |= AMDGPU_GEM_DOMAIN_GTT;
+                               break;
+                       case IP_VERSION(2, 1, 0):
+                       case IP_VERSION(3, 0, 1):
+                       case IP_VERSION(3, 1, 2):
+                       case IP_VERSION(3, 1, 3):
+                               domain |= AMDGPU_GEM_DOMAIN_GTT;
+                               break;
+                       default:
+                               break;
+                       }
                        break;
                }
        }