Lower severity of Radeon lockup messages.

This commit is contained in:
Dave Jones 2011-10-21 13:02:20 -04:00
parent 855a2fa876
commit 19e3780693
2 changed files with 21 additions and 0 deletions

View File

@ -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

View File

@ -689,6 +689,8 @@ Patch1825: drm-intel-make-lvds-work.patch
# rhbz#729882, https://bugs.freedesktop.org/attachment.cgi?id=49069
Patch1826: 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
@ -1321,6 +1323,9 @@ ApplyOptionalPatch drm-nouveau-updates.patch
ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-intel-make-lvds-work.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
@ -2085,6 +2090,9 @@ fi
# ||----w |
# || ||
%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)