drm/radeon: don't try to recreate sysfs entries on resume

Fixes a harmless error message caused by:
51a4726b04e880fdd9b4e0e58b13f70b0a68a7f5

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

2 files changed, 22 insertions, 14 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index f03b7eb15233..b6cbd816537e 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1658,6 +1658,7 @@ struct radeon_pm {
         u8                      fan_max_rpm;
         /* dpm */
         bool                    dpm_enabled;
+        bool                    sysfs_initialized;
         struct radeon_dpm       dpm;
 };
 
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 6a0a176e26ec..5feee3b4c557 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -1528,19 +1528,23 @@ int radeon_pm_late_init(struct radeon_device *rdev)
 
         if (rdev->pm.pm_method == PM_METHOD_DPM) {
                 if (rdev->pm.dpm_enabled) {
-                        ret = device_create_file(rdev->dev, &dev_attr_power_dpm_state);
-                        if (ret)
-                                DRM_ERROR("failed to create device file for dpm state\n");
-                        ret = device_create_file(rdev->dev, &dev_attr_power_dpm_force_performance_level);
-                        if (ret)
-                                DRM_ERROR("failed to create device file for dpm state\n");
-                        /* XXX: these are noops for dpm but are here for backwards compat */
-                        ret = device_create_file(rdev->dev, &dev_attr_power_profile);
-                        if (ret)
-                                DRM_ERROR("failed to create device file for power profile\n");
-                        ret = device_create_file(rdev->dev, &dev_attr_power_method);
-                        if (ret)
-                                DRM_ERROR("failed to create device file for power method\n");
+                        if (!rdev->pm.sysfs_initialized) {
+                                ret = device_create_file(rdev->dev, &dev_attr_power_dpm_state);
+                                if (ret)
+                                        DRM_ERROR("failed to create device file for dpm state\n");
+                                ret = device_create_file(rdev->dev, &dev_attr_power_dpm_force_performance_level);
+                                if (ret)
+                                        DRM_ERROR("failed to create device file for dpm state\n");
+                                /* XXX: these are noops for dpm but are here for backwards compat */
+                                ret = device_create_file(rdev->dev, &dev_attr_power_profile);
+                                if (ret)
+                                        DRM_ERROR("failed to create device file for power profile\n");
+                                ret = device_create_file(rdev->dev, &dev_attr_power_method);
+                                if (ret)
+                                        DRM_ERROR("failed to create device file for power method\n");
+                                if (!ret)
+                                        rdev->pm.sysfs_initialized = true;
+                        }
 
                         mutex_lock(&rdev->pm.mutex);
                         ret = radeon_dpm_late_enable(rdev);
@@ -1556,7 +1560,8 @@ int radeon_pm_late_init(struct radeon_device *rdev)
                         }
                 }
         } else {
-                if (rdev->pm.num_power_states > 1) {
+                if ((rdev->pm.num_power_states > 1) &&
+                    (!rdev->pm.sysfs_initialized)) {
                         /* where's the best place to put these? */
                         ret = device_create_file(rdev->dev, &dev_attr_power_profile);
                         if (ret)
@@ -1564,6 +1569,8 @@ int radeon_pm_late_init(struct radeon_device *rdev)
                         ret = device_create_file(rdev->dev, &dev_attr_power_method);
                         if (ret)
                                 DRM_ERROR("failed to create device file for power method\n");
+                        if (!ret)
+                                rdev->pm.sysfs_initialized = true;
                 }
         }
         return ret;