[kernel/f14] Lower severity of Radeon lockup messages.

[Dave Jones]

commit 87d5560157745967793d2615b5eee0f3d4697786
Author: Dave Jones <davej at redhat.com>
Date:   Fri Oct 21 14:11:16 2011 -0400

    Lower severity of Radeon lockup messages.

 drm-lower-severity-radeon-lockup.diff |   11 +++++++++++
 kernel.spec                           |    6 ++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/drm-lower-severity-radeon-lockup.diff b/drm-lower-severity-radeon-lockup.diff
new file mode 100644
index 0000000..a550d48
--- /dev/null
+++ b/drm-lower-severity-radeon-lockup.diff
@@ -0,0 +1,11 @@
+--- linux-2.6.35.noarch/drivers/gpu/drm/radeon/radeon_fence.c~	2011-10-21 14:08:15.229351796 -0400
++++ linux-2.6.35.noarch/drivers/gpu/drm/radeon/radeon_fence.c	2011-10-21 14:08:35.140287089 -0400
+@@ -232,7 +232,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", fence->seq, seq);
++			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 e2b8ccf..c1af0aa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -710,6 +710,7 @@ Patch1826: drm-i915-disable-sr-polling.patch
 Patch1828: drm-ttm-fix-two-race-conditions-fix-busy-codepaths.patch
 
 Patch1830: drm-radeon-r600-cs-checker-fixes.patch
+Patch1850: drm-lower-severity-radeon-lockup.diff
 
 Patch1900: linux-2.6-intel-iommu-igfx.patch
 Patch2000: efifb-add-more-models.patch
@@ -1503,6 +1504,8 @@ ApplyPatch drm-ttm-fix-two-race-conditions-fix-busy-codepaths.patch
 
 ApplyPatch drm-radeon-r600-cs-checker-fixes.patch
 
+ApplyPatch drm-lower-severity-radeon-lockup.diff
+
 ApplyPatch efifb-add-more-models.patch
 ApplyPatch efifb-check-that-the-base-addr-is-plausible-on-pci-systems.patch
 
@@ -2289,6 +2292,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 21 2011 Dave Jones <davej at redhat.com>
+- Lower severity of Radeon lockup messages.
+
 * Fri Oct 20 2011 Josh Boyer <jwboyer at redhat.com>
 - Add fix for ext4 BUG_ON backtrace (rhbz 747948)