From: Sebastian Wick <sebast...@sebastianwick.net>

This reverts commit 76cb763e6ea62e838ccc8f7a1ea4246d690fccc9.

Reverting the panel_power_savings sysfs. See next commit.

Signed-off-by: Sebastian Wick <sebastian.w...@redhat.com>
---
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 29 +++----------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git ./drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
../drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 7e7929f24ae4..4d4c75173fc3 100644
--- ./drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ ../drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6840,34 +6840,12 @@ static const struct attribute_group amdgpu_group = {
        .attrs = amdgpu_attrs
 };
 
-static bool
-amdgpu_dm_should_create_sysfs(struct amdgpu_dm_connector *amdgpu_dm_connector)
-{
-       if (amdgpu_dm_abm_level >= 0)
-               return false;
-
-       if (amdgpu_dm_connector->base.connector_type != DRM_MODE_CONNECTOR_eDP)
-               return false;
-
-       /* check for OLED panels */
-       if (amdgpu_dm_connector->bl_idx >= 0) {
-               struct drm_device *drm = amdgpu_dm_connector->base.dev;
-               struct amdgpu_display_manager *dm = &drm_to_adev(drm)->dm;
-               struct amdgpu_dm_backlight_caps *caps;
-
-               caps = &dm->backlight_caps[amdgpu_dm_connector->bl_idx];
-               if (caps->aux_support)
-                       return false;
-       }
-
-       return true;
-}
-
 static void amdgpu_dm_connector_unregister(struct drm_connector *connector)
 {
        struct amdgpu_dm_connector *amdgpu_dm_connector = 
to_amdgpu_dm_connector(connector);
 
-       if (amdgpu_dm_should_create_sysfs(amdgpu_dm_connector))
+       if (connector->connector_type == DRM_MODE_CONNECTOR_eDP &&
+           amdgpu_dm_abm_level < 0)
                sysfs_remove_group(&connector->kdev->kobj, &amdgpu_group);
 
        drm_dp_aux_unregister(&amdgpu_dm_connector->dm_dp_aux.aux);
@@ -6974,7 +6952,8 @@ amdgpu_dm_connector_late_register(struct drm_connector 
*connector)
                to_amdgpu_dm_connector(connector);
        int r;
 
-       if (amdgpu_dm_should_create_sysfs(amdgpu_dm_connector)) {
+       if (connector->connector_type == DRM_MODE_CONNECTOR_eDP &&
+           amdgpu_dm_abm_level < 0) {
                r = sysfs_create_group(&connector->kdev->kobj,
                                       &amdgpu_group);
                if (r)
-- 
2.45.2

Reply via email to