|
@@ -460,10 +460,6 @@ static ssize_t radeon_get_dpm_state(struct device *dev,
|
|
|
struct radeon_device *rdev = ddev->dev_private;
|
|
|
enum radeon_pm_state_type pm = rdev->pm.dpm.user_state;
|
|
|
|
|
|
- if ((rdev->flags & RADEON_IS_PX) &&
|
|
|
- (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
|
|
|
- return snprintf(buf, PAGE_SIZE, "off\n");
|
|
|
-
|
|
|
return snprintf(buf, PAGE_SIZE, "%s\n",
|
|
|
(pm == POWER_STATE_TYPE_BATTERY) ? "battery" :
|
|
|
(pm == POWER_STATE_TYPE_BALANCED) ? "balanced" : "performance");
|
|
@@ -477,11 +473,6 @@ static ssize_t radeon_set_dpm_state(struct device *dev,
|
|
|
struct drm_device *ddev = dev_get_drvdata(dev);
|
|
|
struct radeon_device *rdev = ddev->dev_private;
|
|
|
|
|
|
- /* Can't set dpm state when the card is off */
|
|
|
- if ((rdev->flags & RADEON_IS_PX) &&
|
|
|
- (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
mutex_lock(&rdev->pm.mutex);
|
|
|
if (strncmp("battery", buf, strlen("battery")) == 0)
|
|
|
rdev->pm.dpm.user_state = POWER_STATE_TYPE_BATTERY;
|
|
@@ -495,7 +486,12 @@ static ssize_t radeon_set_dpm_state(struct device *dev,
|
|
|
goto fail;
|
|
|
}
|
|
|
mutex_unlock(&rdev->pm.mutex);
|
|
|
- radeon_pm_compute_clocks(rdev);
|
|
|
+
|
|
|
+ /* Can't set dpm state when the card is off */
|
|
|
+ if (!(rdev->flags & RADEON_IS_PX) ||
|
|
|
+ (ddev->switch_power_state == DRM_SWITCH_POWER_ON))
|
|
|
+ radeon_pm_compute_clocks(rdev);
|
|
|
+
|
|
|
fail:
|
|
|
return count;
|
|
|
}
|