From: Greg Kroah-Hartman Date: Sun, 9 Feb 2014 04:47:30 +0000 (-0800) Subject: 3.12-stable patches X-Git-Tag: v3.4.80~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=931c31629f21ce29e20da581775375f4d77b7be6;p=thirdparty%2Fkernel%2Fstable-queue.git 3.12-stable patches added patches: radeon-pm-guard-access-to-rdev-pm.power_state-array.patch --- diff --git a/queue-3.12/radeon-pm-guard-access-to-rdev-pm.power_state-array.patch b/queue-3.12/radeon-pm-guard-access-to-rdev-pm.power_state-array.patch new file mode 100644 index 00000000000..8d74d6d0750 --- /dev/null +++ b/queue-3.12/radeon-pm-guard-access-to-rdev-pm.power_state-array.patch @@ -0,0 +1,40 @@ +From 370169516e736edad3b3c5aa49858058f8b55195 Mon Sep 17 00:00:00 2001 +From: Michel Dänzer +Date: Wed, 8 Jan 2014 11:40:20 +0900 +Subject: radeon/pm: Guard access to rdev->pm.power_state array +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Michel Dänzer + +commit 370169516e736edad3b3c5aa49858058f8b55195 upstream. + +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 +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/radeon_pm.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/radeon/radeon_pm.c ++++ b/drivers/gpu/drm/radeon/radeon_pm.c +@@ -1024,8 +1024,10 @@ static void radeon_pm_resume_old(struct + rdev->pm.current_clock_mode_index = 0; + rdev->pm.current_sclk = rdev->pm.default_sclk; + rdev->pm.current_mclk = rdev->pm.default_mclk; +- rdev->pm.current_vddc = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage; +- rdev->pm.current_vddci = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.vddci; ++ if (rdev->pm.power_state) { ++ rdev->pm.current_vddc = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage; ++ rdev->pm.current_vddci = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.vddci; ++ } + if (rdev->pm.pm_method == PM_METHOD_DYNPM + && rdev->pm.dynpm_state == DYNPM_STATE_SUSPENDED) { + rdev->pm.dynpm_state = DYNPM_STATE_ACTIVE; diff --git a/queue-3.12/series b/queue-3.12/series index 06f91f1412d..bafeffeb5b3 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -56,3 +56,4 @@ dm-space-map-metadata-fix-extending-the-space-map.patch dm-space-map-metadata-fix-bug-in-resizing-of-thin-metadata.patch drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch drm-radeon-dpm-disable-mclk-switching-on-desktop-rv770.patch +radeon-pm-guard-access-to-rdev-pm.power_state-array.patch