3.19.8-ckt10 -stable review patch. If anyone has any objections, please let me
know.
------------------
From: Alex Deucher <alexander.deuc...@amd.com>
commit 49abb26651167c892393cd9f2ad23df429645ed9 upstream.
Fixes a harmless error message caused by:
51a4726b04e880fdd9b4e0e58b13f70b0a68a7f5
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Kamal Mostafa <ka...@canonical.com>
---
drivers/gpu/drm/radeon/radeon.h | 1 +
drivers/gpu/drm/radeon/radeon_pm.c | 35 +++++++++++++++++++++--------------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 6cb4dc1..6985954 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1654,6 +1654,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 d22cf0d..fa537c0 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -1390,19 +1390,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);
@@ -1418,7 +1422,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)
@@ -1426,6 +1431,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;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
