drm/amdgpu: derive GTT display support from DM

Rather than duplicating the logic in two places,
consolidate the logic in the display manager.

Acked-by: Yifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 29b5944..448e9b4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -506,33 +506,9 @@ uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev,
         */
        if ((bo_flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC) &&
            amdgpu_bo_support_uswc(bo_flags) &&
-           amdgpu_device_asic_has_dc_support(adev->asic_type)) {
-               switch (adev->asic_type) {
-               case CHIP_CARRIZO:
-               case CHIP_STONEY:
-                       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;
-               }
-       }
+           amdgpu_device_asic_has_dc_support(adev->asic_type) &&
+           adev->mode_info.gpu_vm_support)
+               domain |= AMDGPU_GEM_DOMAIN_GTT;
 #endif
 
        return domain;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 902235f..a546cb3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -341,6 +341,7 @@ struct amdgpu_mode_info {
        int                     num_crtc; /* number of crtcs */
        int                     num_hpd; /* number of hpd pins */
        int                     num_dig; /* number of dig blocks */
+       bool                    gpu_vm_support; /* supports display from GTT */
        int                     disp_priority;
        const struct amdgpu_display_funcs *funcs;
        const enum drm_plane_type *plane_type;

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 306b321..d73ec30 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1471,6 +1471,11 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
                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))
+                               init_data.flags.gpu_vm_support = true;
+                       break;
                case IP_VERSION(2, 1, 0):
                case IP_VERSION(3, 0, 1):
                case IP_VERSION(3, 1, 2):
@@ -1484,6 +1489,9 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
                break;
        }
 
+       if (init_data.flags.gpu_vm_support)
+               adev->mode_info.gpu_vm_support = true;
+
        if (amdgpu_dc_feature_mask & DC_FBC_MASK)
                init_data.flags.fbc_support = true;