xserver-xorg-video-nouveau: Changes to 'debian-unstable'
ChangeLog | 8 ++++++++
debian/changelog | 5 +++--
src/nouveau_dri2.c | 7 -------
3 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit ac76dd7a62f72ca2cb97842c64a54abcf3b6c19e
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Jun 14 09:50:22 2012 +0200
Cherry pick the silence flip event patch too to reduce spam.
diff --git a/ChangeLog b/ChangeLog
index b574932..d40e05b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+commit 36d3f8c28c55c05ccf4efa985831d2d249bad2fe
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Wed Jun 13 22:41:58 2012 +1000
+
+ dri2: kill debug spam
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
commit 4dbc132f22721e3da30eb2e7fc97dea5b8458df6
Author: Viktor Novotný <noviktor@seznam.cz>
Date: Sat May 26 22:15:20 2012 +0200
diff --git a/debian/changelog b/debian/changelog
index dcf1498..47684ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-video-nouveau (1:0.0.16+git20120608+4dbc132-1) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:0.0.16+git20120611+36d3f8c-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream snapshot. Picks up a EXA fix for pre-nv50 cards.
+ * Cherry pick the silence flip event patch too to reduce spam.
- -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Fri, 08 Jun 2012 10:36:08 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Fri, 14 Jun 2012 09:49:45 +0200
xserver-xorg-video-nouveau (1:0.0.16+git20120529+ace77b6-1) experimental; urgency=low
commit 36d3f8c28c55c05ccf4efa985831d2d249bad2fe
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Wed Jun 13 22:41:58 2012 +1000
dri2: kill debug spam
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
index 27627e6..0b3cc38 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 = xf86ScreenToScrn(screen);
- 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:
Reply to: