Merge tag 'amd-drm-next-5.18-2022-02-11-1' of https://gitlab.freedesktop.org/agd5f...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_display.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 3f21a13882a878d78dcdce5bea23a98deb68d504..ec4c9ef5f795982a5af7b513330523f99d40b708 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -512,19 +512,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;
                }
        }