aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Müller <serveralex@gmail.com>2011-12-30 12:55:48 -0500
committerDave Airlie <airlied@redhat.com>2012-01-03 09:17:16 +0000
commit4376eee92e5a8332b470040e672ea99cd44c826a (patch)
treed26e398b57d3d907423eb709f9e221d9fe1ab616
parent115e8e705e4be071b9e06ff72578e3b603f2ba65 (diff)
downloadlinux-linaro-4376eee92e5a8332b470040e672ea99cd44c826a.tar.gz
drm/radeon/kms/atom: fix possible segfault in pm setup
If we end up with no power states, don't look up current vddc. fixes: https://bugs.freedesktop.org/show_bug.cgi?id=44130 agd5f: fix patch formatting Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_atombios.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index d24baf30efc..5082d17d14d 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -2560,7 +2560,11 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev)
rdev->pm.current_power_state_index = rdev->pm.default_power_state_index;
rdev->pm.current_clock_mode_index = 0;
- rdev->pm.current_vddc = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage;
+ if (rdev->pm.default_power_state_index >= 0)
+ rdev->pm.current_vddc =
+ rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage;
+ else
+ rdev->pm.current_vddc = 0;
}
void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable)