drm/amdgpu: clarify DC checks

There are several places where we don't want to check
if a particular asic could support DC, but rather, if
DC is enabled.  Set a flag if DC is enabled and check
for that rather than if a device supports DC or not.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 117902891fabf5a5df7a665734936d22818e3511..5a4aaf4d9ed1ac594950882c04360f55c692b60e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1065,6 +1065,7 @@ struct amdgpu_device {
        struct work_struct              reset_work;
 
        bool                            job_hang;
+       bool                            dc_enabled;
 };
 
 static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index b14800ac179ee1054fa9d827c03c764119192d2f..57b5e11446c65a4c95eb237cb268b9260f0f9be5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -847,7 +847,7 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
        struct amdgpu_atif *atif = &amdgpu_acpi_priv.atif;
 
        if (atif->notifications.brightness_change) {
-               if (amdgpu_device_has_dc_support(adev)) {
+               if (adev->dc_enabled) {
 #if defined(CONFIG_DRM_AMD_DC)
                        struct amdgpu_display_manager *dm = &adev->dm;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index de61a85c4b02202dbe5f1ea43d5b1ab5148968c8..0f16d3c093091dc2d7dc2f455a7d48046b1462c6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -1969,7 +1969,7 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
        amdgpu_ta_if_debugfs_init(adev);
 
 #if defined(CONFIG_DRM_AMD_DC)
-       if (amdgpu_device_has_dc_support(adev))
+       if (adev->dc_enabled)
                dtn_debugfs_init(adev);
 #endif
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 72d803060730f3ab84e49e9b84cb71e946da87a3..ee69cc3a5efd99cca6d580b72a792bf41ef2299e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -4224,25 +4224,27 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon)
 
        amdgpu_ras_resume(adev);
 
-       /*
-        * Most of the connector probing functions try to acquire runtime pm
-        * refs to ensure that the GPU is powered on when connector polling is
-        * performed. Since we're calling this from a runtime PM callback,
-        * trying to acquire rpm refs will cause us to deadlock.
-        *
-        * Since we're guaranteed to be holding the rpm lock, it's safe to
-        * temporarily disable the rpm helpers so this doesn't deadlock us.
-        */
+       if (adev->mode_info.num_crtc) {
+               /*
+                * Most of the connector probing functions try to acquire runtime pm
+                * refs to ensure that the GPU is powered on when connector polling is
+                * performed. Since we're calling this from a runtime PM callback,
+                * trying to acquire rpm refs will cause us to deadlock.
+                *
+                * Since we're guaranteed to be holding the rpm lock, it's safe to
+                * temporarily disable the rpm helpers so this doesn't deadlock us.
+                */
 #ifdef CONFIG_PM
-       dev->dev->power.disable_depth++;
+               dev->dev->power.disable_depth++;
 #endif
-       if (!amdgpu_device_has_dc_support(adev))
-               drm_helper_hpd_irq_event(dev);
-       else
-               drm_kms_helper_hotplug_event(dev);
+               if (!adev->dc_enabled)
+                       drm_helper_hpd_irq_event(dev);
+               else
+                       drm_kms_helper_hotplug_event(dev);
 #ifdef CONFIG_PM
-       dev->dev->power.disable_depth--;
+               dev->dev->power.disable_depth--;
 #endif
+       }
        adev->in_suspend = false;
 
        if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D0))

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 85138157ea6a4ec3e2456aee6a3ff944498c9c57..83a271578265b62725e7bfef7bc847dcaebe7b20 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -549,7 +549,7 @@ 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_has_dc_support(adev) &&
+           adev->dc_enabled &&
            adev->mode_info.gpu_vm_support)
                domain |= AMDGPU_GEM_DOMAIN_GTT;
 #endif
@@ -1316,7 +1316,7 @@ int amdgpu_display_modeset_create_props(struct amdgpu_device *adev)
                                         "dither",
                                         amdgpu_dither_enum_list, sz);
 
-       if (amdgpu_device_has_dc_support(adev)) {
+       if (adev->dc_enabled) {
                adev->mode_info.abm_level_property =
                        drm_property_create_range(adev_to_drm(adev), 0,
                                                  "abm level", 0, 4);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index bf2d50c8c92ad5e1f64ce125f6793a1b3131e88a..3531d9014a648d4968806b530a663bfe62cfede9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2471,7 +2471,7 @@ static int amdgpu_runtime_idle_check_display(struct device *dev)
                if (ret)
                        return ret;
 
-               if (amdgpu_device_has_dc_support(adev)) {
+               if (adev->dc_enabled) {
                        struct drm_crtc *crtc;
 
                        drm_for_each_crtc(crtc, drm_dev) {

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 65715e6e3dd5e92c3e58fb9e3f6f4301e6017043..123c235b60bc07be169692c163c3cbfaa016799f 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4592,6 +4592,7 @@ static int dm_early_init(void *handle)
                adev_to_drm(adev)->dev,
                &dev_attr_s3_debug);
 #endif
+       adev->dc_enabled = true;
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
index 1159ae114dd02160645990dba6d008052d155e34..304190d5c9d26df1be7a9a8a6b7a76231283f542 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
@@ -1508,7 +1508,7 @@ static void pp_pm_compute_clocks(void *handle)
        struct pp_hwmgr *hwmgr = handle;
        struct amdgpu_device *adev = hwmgr->adev;
 
-       if (!amdgpu_device_has_dc_support(adev)) {
+       if (!adev->dc_enabled) {
                amdgpu_dpm_get_active_displays(adev);
                adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtc_count;
                adev->pm.pm_display_cfg.vrefresh = amdgpu_dpm_get_vrefresh(adev);