From: Greg Kroah-Hartman Date: Tue, 18 Nov 2014 19:17:21 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v3.10.61~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa43f1cf2bef57195d1b0805b612fa319dfa3037;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: drm-radeon-add-missing-crtc-unlock-when-setting-up-the-mc.patch --- diff --git a/queue-3.10/drm-radeon-add-missing-crtc-unlock-when-setting-up-the-mc.patch b/queue-3.10/drm-radeon-add-missing-crtc-unlock-when-setting-up-the-mc.patch new file mode 100644 index 00000000000..3b5ced0be96 --- /dev/null +++ b/queue-3.10/drm-radeon-add-missing-crtc-unlock-when-setting-up-the-mc.patch @@ -0,0 +1,28 @@ +From f0d7bfb9407fccb6499ec01c33afe43512a439a2 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Wed, 5 Nov 2014 17:14:32 -0500 +Subject: drm/radeon: add missing crtc unlock when setting up the MC + +From: Alex Deucher + +commit f0d7bfb9407fccb6499ec01c33afe43512a439a2 upstream. + +Need to unlock the crtc after updating the blanking state. + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/evergreen.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/gpu/drm/radeon/evergreen.c ++++ b/drivers/gpu/drm/radeon/evergreen.c +@@ -2379,6 +2379,7 @@ void evergreen_mc_stop(struct radeon_dev + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1); + tmp |= EVERGREEN_CRTC_BLANK_DATA_EN; + WREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp); ++ WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0); + } + } else { + tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]); diff --git a/queue-3.10/series b/queue-3.10/series index 8659bec96a4..2d2dd6621b4 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -20,3 +20,4 @@ libceph-do-not-crash-on-large-auth-tickets.patch iwlwifi-configure-the-ltr.patch macvtap-fix-csum_start-when-vlan-tags-are-present.patch mac80211-fix-use-after-free-in-defragmentation.patch +drm-radeon-add-missing-crtc-unlock-when-setting-up-the-mc.patch