3.4-stable patches

added patches:
	drm-radeon-fix-cursor-corruption-on-dce6-and-newer.patch

diff --git a/queue-3.4/drm-radeon-fix-cursor-corruption-on-dce6-and-newer.patch b/queue-3.4/drm-radeon-fix-cursor-corruption-on-dce6-and-newer.patch
new file mode 100644 (file)
index 0000000..5b9ea2c
--- /dev/null
+++ b/queue-3.4/drm-radeon-fix-cursor-corruption-on-dce6-and-newer.patch
@@ -0,0 +1,35 @@
+From e521a29014794d139cca46396d1af8faf1295a26 Mon Sep 17 00:00:00 2001
+From: Jerome Glisse <jglisse@redhat.com>
+Date: Mon, 21 Jan 2013 15:50:03 -0500
+Subject: drm/radeon: fix cursor corruption on DCE6 and newer
+
+From: Jerome Glisse <jglisse@redhat.com>
+
+commit e521a29014794d139cca46396d1af8faf1295a26 upstream.
+
+Aruba and newer gpu does not need the avivo cursor work around,
+quite the opposite this work around lead to corruption.
+
+agd5f: check DCE6 rather than ARUBA since the issue is DCE
+version specific rather than family specific.
+
+Signed-off-by: Jerome Glisse <jglisse@redhat.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_cursor.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_cursor.c
++++ b/drivers/gpu/drm/radeon/radeon_cursor.c
+@@ -238,7 +238,8 @@ int radeon_crtc_cursor_move(struct drm_c
+               y = 0;
+       }
+ 
+-      if (ASIC_IS_AVIVO(rdev)) {
++      /* fixed on DCE6 and newer */
++      if (ASIC_IS_AVIVO(rdev) && !ASIC_IS_DCE6(rdev)) {
+               int i = 0;
+               struct drm_crtc *crtc_p;
+ 

diff --git a/queue-3.4/series b/queue-3.4/series
index f4cca5bfa78140c223208029d41d6ddd625c707e..708b474bb34ab49665bdbaf10d35f50eccd3483f 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -6,3 +6,4 @@ arm-dma-fix-struct-page-iterator-in-dma_cache_maint-to-work-with-sparsemem.patch
 arm-at91-rm9200-remake-the-bga-as-default-version.patch
 arm-7627-1-predicate-preempt-logic-on-preemp_count-not-preempt-alone.patch
 bluetooth-fix-sending-hci-commands-after-reset.patch
+drm-radeon-fix-cursor-corruption-on-dce6-and-newer.patch