diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2014-01-07 21:40:20 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-01-08 11:34:26 -0500 |
commit | 370169516e736edad3b3c5aa49858058f8b55195 (patch) | |
tree | 5f8d37354fa439bdac2f100e9ae1a61c3f4a5411 | |
parent | 0091fc13c737e1c72fea1cea96b312d3ff86a321 (diff) |
radeon/pm: Guard access to rdev->pm.power_state array
It's never allocated on systems without an ATOMBIOS or COMBIOS ROM.
Should fix an oops I encountered while resetting the GPU after a lockup
on my PowerBook with an RV350.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index c0ff2002dc8e..0b24c4c7dcf9 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |||
@@ -1010,8 +1010,10 @@ static void radeon_pm_resume_old(struct radeon_device *rdev) | |||
1010 | rdev->pm.current_clock_mode_index = 0; | 1010 | rdev->pm.current_clock_mode_index = 0; |
1011 | rdev->pm.current_sclk = rdev->pm.default_sclk; | 1011 | rdev->pm.current_sclk = rdev->pm.default_sclk; |
1012 | rdev->pm.current_mclk = rdev->pm.default_mclk; | 1012 | rdev->pm.current_mclk = rdev->pm.default_mclk; |
1013 | rdev->pm.current_vddc = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage; | 1013 | if (rdev->pm.power_state) { |
1014 | rdev->pm.current_vddci = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.vddci; | 1014 | rdev->pm.current_vddc = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage; |
1015 | rdev->pm.current_vddci = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.vddci; | ||
1016 | } | ||
1015 | if (rdev->pm.pm_method == PM_METHOD_DYNPM | 1017 | if (rdev->pm.pm_method == PM_METHOD_DYNPM |
1016 | && rdev->pm.dynpm_state == DYNPM_STATE_SUSPENDED) { | 1018 | && rdev->pm.dynpm_state == DYNPM_STATE_SUSPENDED) { |
1017 | rdev->pm.dynpm_state = DYNPM_STATE_ACTIVE; | 1019 | rdev->pm.dynpm_state = DYNPM_STATE_ACTIVE; |