Skip to content

L
linux-davinci
Commit bc4624ca authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Dave Airlie
Browse files
Options

drm/radeon/kms: simplify picking power state 

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 27459324
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 39 deletions
drivers/gpu/drm/radeon/radeon_pm.c
View file @ bc4624ca
...@@ -81,60 +81,39 @@ static void radeon_print_power_mode_info(struct radeon_device *rdev) ...@@ -81,60 +81,39 @@ static void radeon_print_power_mode_info(struct radeon_device *rdev)
static struct radeon_power_state * radeon_pick_power_state(struct radeon_device *rdev, static struct radeon_power_state * radeon_pick_power_state(struct radeon_device *rdev,
enum radeon_pm_state_type type) enum radeon_pm_state_type type)
{ {
int i; int i, j;
struct radeon_power_state *power_state = NULL; enum radeon_pm_state_type wanted_types[2];
int wanted_count;
switch (type) { switch (type) {
case POWER_STATE_TYPE_DEFAULT: case POWER_STATE_TYPE_DEFAULT:
default: default:
return rdev->pm.default_power_state; return rdev->pm.default_power_state;
case POWER_STATE_TYPE_POWERSAVE: case POWER_STATE_TYPE_POWERSAVE:
for (i = 0; i < rdev->pm.num_power_states; i++) { wanted_types[0] = POWER_STATE_TYPE_POWERSAVE;
if (rdev->pm.power_state[i].type == POWER_STATE_TYPE_POWERSAVE) { wanted_types[1] = POWER_STATE_TYPE_BATTERY;
power_state = &rdev->pm.power_state[i]; wanted_count = 2;
break;
}
}
if (power_state == NULL) {
for (i = 0; i < rdev->pm.num_power_states; i++) {
if (rdev->pm.power_state[i].type == POWER_STATE_TYPE_BATTERY) {
power_state = &rdev->pm.power_state[i];
break;
}
}
}
break; break;
case POWER_STATE_TYPE_BATTERY: case POWER_STATE_TYPE_BATTERY:
for (i = 0; i < rdev->pm.num_power_states; i++) { wanted_types[0] = POWER_STATE_TYPE_BATTERY;
if (rdev->pm.power_state[i].type == POWER_STATE_TYPE_BATTERY) { wanted_types[1] = POWER_STATE_TYPE_POWERSAVE;
power_state = &rdev->pm.power_state[i]; wanted_count = 2;
break;
}
}
if (power_state == NULL) {
for (i = 0; i < rdev->pm.num_power_states; i++) {
if (rdev->pm.power_state[i].type == POWER_STATE_TYPE_POWERSAVE) {
power_state = &rdev->pm.power_state[i];
break;
}
}
}
break; break;
case POWER_STATE_TYPE_BALANCED: case POWER_STATE_TYPE_BALANCED:
case POWER_STATE_TYPE_PERFORMANCE: case POWER_STATE_TYPE_PERFORMANCE:
for (i = 0; i < rdev->pm.num_power_states; i++) { wanted_types[0] = type;
if (rdev->pm.power_state[i].type == type) { wanted_count = 1;
power_state = &rdev->pm.power_state[i];
break;
}
}
break; break;
} }
if (power_state == NULL) for (i = 0; i < wanted_count; i++) {
return rdev->pm.default_power_state; for (j = 0; j < rdev->pm.num_power_states; j++) {
if (rdev->pm.power_state[j].type == wanted_types[i])
return &rdev->pm.power_state[j];
}
}
return power_state; return rdev->pm.default_power_state;
} }
static struct radeon_pm_clock_info * radeon_pick_clock_mode(struct radeon_device *rdev, static struct radeon_pm_clock_info * radeon_pick_clock_mode(struct radeon_device *rdev,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment