[xorg-x11-drv-nouveau/f17] kill some debug spam

[Ben Skeggs]

commit 851f9d578f159d4ca4c94615a13dd1af7d9faa00
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Wed Jun 13 22:26:02 2012 +1000

    kill some debug spam

 nouveau-dri-debug-spam.patch |   37 +++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-nouveau.spec    |    7 ++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/nouveau-dri-debug-spam.patch b/nouveau-dri-debug-spam.patch
new file mode 100644
index 0000000..828c372
--- /dev/null
+++ b/nouveau-dri-debug-spam.patch
@@ -0,0 +1,37 @@
+From a9543e58a722d822ca3f2b262157d33e653408ab Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs at redhat.com>
+Date: Wed, 13 Jun 2012 22:24:37 +1000
+Subject: [PATCH] dri: drop some debug spam
+
+---
+ src/nouveau_dri2.c |    7 -------
+ 1 Datei geändert, 7 Zeilen entfernt(-)
+
+diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
+index 7878a5a..d121fc4 100644
+--- a/src/nouveau_dri2.c
++++ b/src/nouveau_dri2.c
+@@ -607,7 +607,6 @@ nouveau_dri2_flip_event_handler(unsigned int frame, unsigned int tv_sec,
+ 	ScreenPtr screen;
+ 	ScrnInfoPtr scrn;
+ 	int status;
+-	PixmapPtr pixmap;
+ 
+ 	status = dixLookupDrawable(&draw, flip->draw, serverClient,
+ 				   M_ANY, DixWriteAccess);
+@@ -619,12 +618,6 @@ nouveau_dri2_flip_event_handler(unsigned int frame, unsigned int tv_sec,
+ 	screen = draw->pScreen;
+ 	scrn = xf86Screens[screen->myNum];
+ 
+-	pixmap = screen->GetScreenPixmap(screen);
+-	xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, 4,
+-		       "%s: flipevent : width %d x height %d : msc %d : ust = %d.%06d\n",
+-		       __func__, pixmap->drawable.width, pixmap->drawable.height,
+-		       frame, tv_sec, tv_usec);
+-
+ 	/* We assume our flips arrive in order, so we don't check the frame */
+ 	switch (flip->action) {
+ 	case SWAP:
+-- 
+1.7.10.2
+
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index d908704..a5719e8 100644
--- a/xorg-x11-drv-nouveau.spec
+++ b/xorg-x11-drv-nouveau.spec
@@ -19,7 +19,7 @@ Name:      xorg-x11-drv-nouveau
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   36.%{snapshot}%{?dist}
+Release:   37.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -41,6 +41,7 @@ Requires:  libdrm >= 2.4.23-0.1.20101108
 Requires:  kernel-drm-nouveau = 16
 Requires:  libudev
 
+Patch0: nouveau-dri-debug-spam.patch
 Patch2: nouveau-nva3-noaccel-info.patch
 
 %description 
@@ -49,6 +50,7 @@ X.Org X11 nouveau video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .dridebug
 %patch2 -p1 -b .nva3info
 
 %build
@@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Jun 13 2012 Ben Skeggs <bskeggs at redhat.com> - 1:0.0.16-37.20120306gitf5d1cd2
+- drop some dri2 debug spam (rhbz#830442)
+
 * Thu Apr 05 2012 Adam Jackson <ajax at redhat.com> - 1:0.0.16-36.20120306gitf5d1cd2
 - RHEL arch exclude updates