rpms/kernel/devel drm-hush-vblank-warning.patch, NONE, 1.1 kernel.spec, 1.1697, 1.1698

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11622

Modified Files:
	kernel.spec 
Added Files:
	drm-hush-vblank-warning.patch 
Log Message:
* Thu Aug 06 2009 Adam Jackson <ajax at redhat.com>
- Hush DRM vblank warnings, they're constant (and harmless) under DRI2.


drm-hush-vblank-warning.patch:
 drm_irq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE drm-hush-vblank-warning.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.jx linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c
--- linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c.jx	2009-08-06 11:09:29.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/drm_irq.c	2009-08-06 14:44:34.000000000 -0400
@@ -634,7 +634,7 @@ int drm_wait_vblank(struct drm_device *d
 
 	ret = drm_vblank_get(dev, crtc);
 	if (ret) {
-		DRM_ERROR("failed to acquire vblank counter, %d\n", ret);
+		DRM_DEBUG("failed to acquire vblank counter, %d\n", ret);
 		return ret;
 	}
 	seq = drm_vblank_count(dev, crtc);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1697
retrieving revision 1.1698
diff -u -p -r1.1697 -r1.1698
--- kernel.spec	6 Aug 2009 05:33:43 -0000	1.1697
+++ kernel.spec	6 Aug 2009 18:48:09 -0000	1.1698
@@ -679,6 +679,7 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
+Patch1827: drm-hush-vblank-warning.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1282,6 +1283,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-r600-kms.patch
+ApplyPatch drm-hush-vblank-warning.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1951,6 +1953,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 06 2009 Adam Jackson <ajax at redhat.com>
+- Hush DRM vblank warnings, they're constant (and harmless) under DRI2.
+
 * Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.134.rc5.git3
 - fixup vga arb warning at startup and handover between gpus