3.4-stable patches

added patches:
	drm-radeon-si-fix-define-for-mc_seq_train_wakeup_cntl.patch

diff --git a/queue-3.4/drm-radeon-si-fix-define-for-mc_seq_train_wakeup_cntl.patch b/queue-3.4/drm-radeon-si-fix-define-for-mc_seq_train_wakeup_cntl.patch
new file mode 100644 (file)
index 0000000..f1aa160
--- /dev/null
+++ b/queue-3.4/drm-radeon-si-fix-define-for-mc_seq_train_wakeup_cntl.patch
@@ -0,0 +1,30 @@
+From d5693761b2b4ff530c8af8af9ec55b6eae76e617 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Mon, 28 Oct 2013 10:56:23 -0400
+Subject: drm/radeon/si: fix define for MC_SEQ_TRAIN_WAKEUP_CNTL
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit d5693761b2b4ff530c8af8af9ec55b6eae76e617 upstream.
+
+Typo in the register offset.
+
+Noticed-by: Sylvain BERTRAND <sylware@legeek.net>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/sid.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/sid.h
++++ b/drivers/gpu/drm/radeon/sid.h
+@@ -165,7 +165,7 @@
+ #define               NOOFGROUPS_SHIFT                                12
+ #define               NOOFGROUPS_MASK                                 0x00001000
+ 
+-#define       MC_SEQ_TRAIN_WAKEUP_CNTL                        0x2808
++#define       MC_SEQ_TRAIN_WAKEUP_CNTL                        0x28e8
+ #define               TRAIN_DONE_D0                           (1 << 30)
+ #define               TRAIN_DONE_D1                           (1 << 31)
+ 

diff --git a/queue-3.4/series b/queue-3.4/series
index 670d27d47e8c4d28dece0ac3a2dc8d5364a980bb..3d5b14df38fc2f7d4a1790e862bc5a9cf7da4bf2 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -45,3 +45,4 @@ ftrace-fix-function-graph-with-loading-of-modules.patch
 drm-ttm-handle-in-memory-region-copies.patch
 drm-i915-flush-cursors-harder.patch
 drm-nouveau-when-bailing-out-of-a-pushbuf-ioctl-do-not-remove-previous-fence.patch
+drm-radeon-si-fix-define-for-mc_seq_train_wakeup_cntl.patch