From 5bbdbe628c83e1e0a6aa180db2716ad994a0ac3f Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Oct 21 2011 17:01:26 +0000
Subject: Lower severity of Radeon lockup messages.


---

diff --git a/drm-lower-severity-radeon-lockup.diff b/drm-lower-severity-radeon-lockup.diff
new file mode 100644
index 0000000..1302c92
--- /dev/null
+++ b/drm-lower-severity-radeon-lockup.diff
@@ -0,0 +1,13 @@
+diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
+index 7fd4e3e..a488b50 100644
+--- a/drivers/gpu/drm/radeon/radeon_fence.c
++++ b/drivers/gpu/drm/radeon/radeon_fence.c
+@@ -263,7 +263,7 @@ retry:
+ 		 */
+ 		if (seq == rdev->fence_drv.last_seq && radeon_gpu_is_lockup(rdev)) {
+ 			/* good news we believe it's a lockup */
+-			WARN(1, "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n",
++			printk(KERN_WARNING "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n",
+ 			     fence->seq, seq);
+ 			/* FIXME: what should we do ? marking everyone
+ 			 * as signaled for now
diff --git a/kernel.spec b/kernel.spec
index b2d4d02..bce645d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -690,6 +690,8 @@ Patch1826: drm-i915-fbc-stfu.patch
 # rhbz#729882, https://bugs.freedesktop.org/attachment.cgi?id=49069
 Patch1827: drm-i915-sdvo-lvds-is-digital.patch
 
+Patch1850: drm-lower-severity-radeon-lockup.diff
+
 Patch1900: linux-2.6-intel-iommu-igfx.patch
 
 # Quiet boot fixes
@@ -1328,6 +1330,9 @@ ApplyOptionalPatch drm-intel-next.patch
 ApplyPatch drm-intel-make-lvds-work.patch
 ApplyPatch drm-i915-fbc-stfu.patch
 ApplyPatch drm-i915-sdvo-lvds-is-digital.patch
+
+ApplyPatch drm-lower-severity-radeon-lockup.diff
+
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 
 # silence the ACPI blacklist code
@@ -2086,6 +2091,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 21 2011 Dave Jones <davej@redhat.com>
+- Lower severity of Radeon lockup messages.
+
 * Wed Oct 19 2011 Dave Jones <davej@redhat.com>
 - Add Sony VGN-FW21E to nonvs blacklist. (rhbz 641789)