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 (file)
index 0000000..3b5ced0
--- /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 <alexander.deucher@amd.com>
+Date: Wed, 5 Nov 2014 17:14:32 -0500
+Subject: drm/radeon: add missing crtc unlock when setting up the MC
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit f0d7bfb9407fccb6499ec01c33afe43512a439a2 upstream.
+
+Need to unlock the crtc after updating the blanking state.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 8659bec96a49477cb50aa3f5b6adbda03410fafe..2d2dd6621b49d6659f62777f71f3151c7183b185 100644 (file)
--- 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