AtomBIOS tables on non-mobility GPU do not contain POWERSAVE/BATTERY.

Signed-off-by: Rafał Miłecki <[email protected]>
---
 drivers/gpu/drm/radeon/radeon_pm.c |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c 
b/drivers/gpu/drm/radeon/radeon_pm.c
index f46d574..97375d3 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -91,14 +91,24 @@ static struct radeon_power_state * 
radeon_pick_power_state(struct radeon_device
        default:
                return rdev->pm.default_power_state;
        case POWER_STATE_TYPE_POWERSAVE:
-               wanted_types[0] = POWER_STATE_TYPE_POWERSAVE;
-               wanted_types[1] = POWER_STATE_TYPE_BATTERY;
-               wanted_count = 2;
+               if (rdev->flags & RADEON_IS_MOBILITY) {
+                       wanted_types[0] = POWER_STATE_TYPE_POWERSAVE;
+                       wanted_types[1] = POWER_STATE_TYPE_BATTERY;
+                       wanted_count = 2;
+               } else {
+                       wanted_types[0] = POWER_STATE_TYPE_PERFORMANCE;
+                       wanted_count = 1;
+               }
                break;
        case POWER_STATE_TYPE_BATTERY:
-               wanted_types[0] = POWER_STATE_TYPE_BATTERY;
-               wanted_types[1] = POWER_STATE_TYPE_POWERSAVE;
-               wanted_count = 2;
+               if (rdev->flags & RADEON_IS_MOBILITY) {
+                       wanted_types[0] = POWER_STATE_TYPE_BATTERY;
+                       wanted_types[1] = POWER_STATE_TYPE_POWERSAVE;
+                       wanted_count = 2;
+               } else {
+                       wanted_types[0] = POWER_STATE_TYPE_PERFORMANCE;
+                       wanted_count = 1;
+               }
                break;
        case POWER_STATE_TYPE_BALANCED:
        case POWER_STATE_TYPE_PERFORMANCE:
-- 
1.6.4.2


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel

Reply via email to