xorg-server: Changes to 'debian-unstable'
debian/changelog | 9
debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff | 31
debian/patches/revert-eb5108b870.diff | 35
debian/patches/series | 5
debian/patches/vidmode-reduce-verbosity-of-getmodeline.diff | 372 ++++++++++
5 files changed, 452 insertions(+)
New commits:
commit 481e6de95910ffbe9794c004bde956003ace50d1
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Mar 22 09:47:36 2016 +0200
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 01b83b0..24902b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.18.2-2) UNRELEASED; urgency=medium
+xorg-server (2:1.18.2-2) unstable; urgency=medium
* regression fixes/workarounds:
vidmode-reduce-verbosity-of-getmodeline.diff (Closes: #818634)
glamor-swizzle-red-to-0-for-alpha-textures.diff
revert-eb5108b870.diff (Closes: #818172)
- -- Timo Aaltonen <tjaalton@debian.org> Tue, 22 Mar 2016 09:37:39 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 22 Mar 2016 09:47:25 +0200
xorg-server (2:1.18.2-1) unstable; urgency=medium
commit 31f5363b11f4e39e04639616315c8e722ff89b38
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Mar 22 09:42:30 2016 +0200
add some regression fixes from upstream, and one revert
diff --git a/debian/changelog b/debian/changelog
index f3d2dbc..01b83b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.18.2-2) UNRELEASED; urgency=medium
+
+ * regression fixes/workarounds:
+ vidmode-reduce-verbosity-of-getmodeline.diff (Closes: #818634)
+ glamor-swizzle-red-to-0-for-alpha-textures.diff
+ revert-eb5108b870.diff (Closes: #818172)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 22 Mar 2016 09:37:39 +0200
+
xorg-server (2:1.18.2-1) unstable; urgency=medium
* New upstream release. (Closes: #814982)
diff --git a/debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff b/debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff
new file mode 100644
index 0000000..e7220a9
--- /dev/null
+++ b/debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff
@@ -0,0 +1,31 @@
+commit a288cf58a0dc0f965a6f964c76bb86bb1989d797
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Mar 16 10:45:54 2016 +1000
+
+ glamor: swizzle RED to 0 for alpha textures
+
+ I'm pretty sure Eric suspected this could cause a problem, and we
+ couldn't find a test. Well loading feedly in firefox seems to trigger
+ badness that this solves.
+
+ bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94554
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
+
+diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
+index a531f60..f4f8749 100644
+--- a/glamor/glamor_fbo.c
++++ b/glamor/glamor_fbo.c
+@@ -352,8 +352,10 @@ _glamor_create_tex(glamor_screen_private *glamor_priv,
+ glBindTexture(GL_TEXTURE_2D, tex);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+- if (format == glamor_priv->one_channel_format && format == GL_RED)
++ if (format == glamor_priv->one_channel_format && format == GL_RED) {
++ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_ZERO);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED);
++ }
+ glamor_priv->suppress_gl_out_of_memory_logging = true;
+ glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0,
+ format, GL_UNSIGNED_BYTE, NULL);
diff --git a/debian/patches/revert-eb5108b870.diff b/debian/patches/revert-eb5108b870.diff
new file mode 100644
index 0000000..0b4e59d
--- /dev/null
+++ b/debian/patches/revert-eb5108b870.diff
@@ -0,0 +1,35 @@
+this reverts:
+
+commit eb5108b87017128f394ae31b5b7cd85dd8819bca
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Feb 24 16:52:58 2016 +0900
+
+ present: Requeue if flip driver hook fails and target MSC not reached
+
+some intel users suffer from frozen X because of it
+
+diff --git b/present/present.c a/present/present.c
+index 7f9fc17..17ec526 100644
+--- b/present/present.c
++++ a/present/present.c
+@@ -712,20 +712,6 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
+ if (window == screen_priv->flip_window)
+ present_unflip(screen);
+ }
+-
+- /* If present_flip failed, we may have to requeue for the target MSC */
+- if (msc_is_after(vblank->target_msc, crtc_msc) &&
+- Success == present_queue_vblank(screen,
+- vblank->crtc,
+- vblank->event_id,
+- vblank->target_msc)) {
+- xorg_list_add(&vblank->event_queue, &present_exec_queue);
+- xorg_list_append(&vblank->window_list,
+- &present_get_window_priv(window, TRUE)->vblank);
+- vblank->queued = TRUE;
+- return;
+- }
+-
+ present_copy_region(&window->drawable, vblank->pixmap, vblank->update, vblank->x_off, vblank->y_off);
+
+ /* present_copy_region sticks the region into a scratch GC,
diff --git a/debian/patches/series b/debian/patches/series
index 2c8af94..5440ad0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,8 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
#08_xfree86_fix_ia64_inx_outx.diff
+
+# 1.18.2 regression fixes/workarounds
+vidmode-reduce-verbosity-of-getmodeline.diff
+glamor-swizzle-red-to-0-for-alpha-textures.diff
+revert-eb5108b870.diff
diff --git a/debian/patches/vidmode-reduce-verbosity-of-getmodeline.diff b/debian/patches/vidmode-reduce-verbosity-of-getmodeline.diff
new file mode 100644
index 0000000..2568262
--- /dev/null
+++ b/debian/patches/vidmode-reduce-verbosity-of-getmodeline.diff
@@ -0,0 +1,372 @@
+commit 75eecf28ae3709181a51571132b0accd9cae316e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Mar 13 13:54:01 2016 +0000
+
+ Xext/vidmode: Reduce verbosity of GetModeLine debug messages
+
+ In commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92
+ Author: Olivier Fourdan <ofourdan@redhat.com>
+ Date: Wed Feb 10 09:34:34 2016 +0100
+
+ vidmode: move to a separate library of its own
+
+ the verbosity of some old debug messages (which print the reply to every
+ GetModeLine client request and others) was increased leading to lots of
+ log spam. Downgrade the logging back to DebugF.
+
+ [ajax: Fix a typo so it compiles.]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=94515
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Cc: Olivier Fourdan <ofourdan@redhat.com>
+
+diff --git a/Xext/vidmode.c b/Xext/vidmode.c
+index 7c838f4..0cbbdc3 100644
+--- a/Xext/vidmode.c
++++ b/Xext/vidmode.c
+@@ -69,7 +69,7 @@ typedef struct {
+ dixSetPrivate(&(c)->devPrivates, VidModeClientPrivateKey, p)
+
+ #ifdef DEBUG
+-#define DEBUG_P(x) LogMessage(X_INFO, x"\n");
++#define DEBUG_P(x) DebugF(x"\n")
+ #else
+ #define DEBUG_P(x) /**/
+ #endif
+@@ -267,13 +267,13 @@ ProcVidModeGetModeLine(ClientPtr client)
+ rep.vtotal = VidModeGetModeValue(mode, VIDMODE_V_TOTAL);
+ rep.flags = VidModeGetModeValue(mode, VIDMODE_FLAGS);
+
+- LogMessage(X_INFO, "GetModeLine - scrn: %d clock: %ld\n",
+- stuff->screen, (unsigned long) rep.dotclock);
+- LogMessage(X_INFO, "GetModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
+- rep.hdisplay, rep.hsyncstart, rep.hsyncend, rep.htotal);
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+- rep.vdisplay, rep.vsyncstart, rep.vsyncend,
+- rep.vtotal, (unsigned long) rep.flags);
++ DebugF("GetModeLine - scrn: %d clock: %ld\n",
++ stuff->screen, (unsigned long) rep.dotclock);
++ DebugF("GetModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ rep.hdisplay, rep.hsyncstart, rep.hsyncend, rep.htotal);
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
++ rep.vdisplay, rep.vsyncstart, rep.vsyncend,
++ rep.vtotal, (unsigned long) rep.flags);
+
+ /*
+ * Older servers sometimes had server privates that the VidMode
+@@ -483,23 +483,23 @@ ProcVidModeAddModeLine(ClientPtr client)
+ stuff->after_vtotal = oldstuff->after_vtotal;
+ stuff->after_flags = oldstuff->after_flags;
+ }
+- LogMessage(X_INFO, "AddModeLine - scrn: %d clock: %ld\n",
+- (int) stuff->screen, (unsigned long) stuff->dotclock);
+- LogMessage(X_INFO, "AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
+- stuff->hdisplay, stuff->hsyncstart,
+- stuff->hsyncend, stuff->htotal);
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
+- stuff->vtotal, (unsigned long) stuff->flags);
+- LogMessage(X_INFO, " after - scrn: %d clock: %ld\n",
+- (int) stuff->screen, (unsigned long) stuff->after_dotclock);
+- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n",
+- stuff->after_hdisplay, stuff->after_hsyncstart,
+- stuff->after_hsyncend, stuff->after_htotal);
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+- stuff->after_vdisplay, stuff->after_vsyncstart,
+- stuff->after_vsyncend, stuff->after_vtotal,
+- (unsigned long) stuff->after_flags);
++ DebugF("AddModeLine - scrn: %d clock: %ld\n",
++ (int) stuff->screen, (unsigned long) stuff->dotclock);
++ DebugF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ stuff->hdisplay, stuff->hsyncstart,
++ stuff->hsyncend, stuff->htotal);
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
++ stuff->vtotal, (unsigned long) stuff->flags);
++ DebugF(" after - scrn: %d clock: %ld\n",
++ (int) stuff->screen, (unsigned long) stuff->after_dotclock);
++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ stuff->after_hdisplay, stuff->after_hsyncstart,
++ stuff->after_hsyncend, stuff->after_htotal);
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
++ stuff->after_vdisplay, stuff->after_vsyncstart,
++ stuff->after_vsyncend, stuff->after_vtotal,
++ (unsigned long) stuff->after_flags);
+
+ if (ver < 2) {
+ REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
+@@ -572,7 +572,7 @@ ProcVidModeAddModeLine(ClientPtr client)
+ VidModeSetModeValue(mode, VIDMODE_FLAGS, stuff->flags);
+
+ if (stuff->privsize)
+- LogMessage(X_INFO, "AddModeLine - Privates in request have been ignored\n");
++ DebugF("AddModeLine - Privates in request have been ignored\n");
+
+ /* Check that the mode is consistent with the monitor specs */
+ switch (pVidMode->CheckModeForMonitor(pScreen, mode)) {
+@@ -601,7 +601,7 @@ ProcVidModeAddModeLine(ClientPtr client)
+
+ pVidMode->AddModeline(pScreen, mode);
+
+- LogMessage(X_INFO, "AddModeLine - Succeeded\n");
++ DebugF("AddModeLine - Succeeded\n");
+
+ return Success;
+ }
+@@ -640,14 +640,14 @@ ProcVidModeDeleteModeLine(ClientPtr client)
+ stuff->flags = oldstuff->flags;
+ stuff->privsize = oldstuff->privsize;
+ }
+- LogMessage(X_INFO, "DeleteModeLine - scrn: %d clock: %ld\n",
+- (int) stuff->screen, (unsigned long) stuff->dotclock);
+- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n",
+- stuff->hdisplay, stuff->hsyncstart,
+- stuff->hsyncend, stuff->htotal);
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
+- (unsigned long) stuff->flags);
++ DebugF("DeleteModeLine - scrn: %d clock: %ld\n",
++ (int) stuff->screen, (unsigned long) stuff->dotclock);
++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ stuff->hdisplay, stuff->hsyncstart,
++ stuff->hsyncend, stuff->htotal);
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
++ (unsigned long) stuff->flags);
+
+ if (ver < 2) {
+ REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
+@@ -662,11 +662,11 @@ ProcVidModeDeleteModeLine(ClientPtr client)
+ bytes_to_int32(sizeof(xXF86VidModeDeleteModeLineReq));
+ }
+ if (len != stuff->privsize) {
+- LogMessage(X_INFO, "req_len = %ld, sizeof(Req) = %d, privsize = %ld, "
+- "len = %d, length = %d\n",
+- (unsigned long) client->req_len,
+- (int) sizeof(xXF86VidModeDeleteModeLineReq) >> 2,
+- (unsigned long) stuff->privsize, len, stuff->length);
++ DebugF("req_len = %ld, sizeof(Req) = %d, privsize = %ld, "
++ "len = %d, length = %d\n",
++ (unsigned long) client->req_len,
++ (int) sizeof(xXF86VidModeDeleteModeLineReq) >> 2,
++ (unsigned long) stuff->privsize, len, stuff->length);
+ return BadLength;
+ }
+
+@@ -681,46 +681,46 @@ ProcVidModeDeleteModeLine(ClientPtr client)
+ if (!pVidMode->GetCurrentModeline(pScreen, &mode, &dotClock))
+ return BadValue;
+
+- LogMessage(X_INFO, "Checking against clock: %d (%d)\n",
++ DebugF("Checking against clock: %d (%d)\n",
++ VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
++ VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
++ VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
++ VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
++ VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
++ VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
++ VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
++ VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
++ VidModeGetModeValue(mode, VIDMODE_FLAGS));
++
++ if ((pVidMode->GetDotClock(pScreen, stuff->dotclock) == dotClock) &&
++ MODEMATCH(mode, stuff))
++ return BadValue;
++
++ if (!pVidMode->GetFirstModeline(pScreen, &mode, &dotClock))
++ return BadValue;
++
++ do {
++ DebugF("Checking against clock: %d (%d)\n",
+ VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
+- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
+ VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
+ VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
+ VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
+ VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
+ VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
+ VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
+ VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
+ VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
+ VidModeGetModeValue(mode, VIDMODE_FLAGS));
+
+- if ((pVidMode->GetDotClock(pScreen, stuff->dotclock) == dotClock) &&
+- MODEMATCH(mode, stuff))
+- return BadValue;
+-
+- if (!pVidMode->GetFirstModeline(pScreen, &mode, &dotClock))
+- return BadValue;
+-
+- do {
+- LogMessage(X_INFO, "Checking against clock: %d (%d)\n",
+- VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
+- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n",
+- VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
+- VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
+- VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
+- VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
+- VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
+- VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
+- VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
+- VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
+- VidModeGetModeValue(mode, VIDMODE_FLAGS));
+-
+ if ((pVidMode->GetDotClock(pScreen, stuff->dotclock) == dotClock) &&
+ MODEMATCH(mode, stuff)) {
+ pVidMode->DeleteModeline(pScreen, mode);
+- LogMessage(X_INFO, "DeleteModeLine - Succeeded\n");
++ DebugF("DeleteModeLine - Succeeded\n");
+ return Success;
+ }
+ } while (pVidMode->GetNextModeline(pScreen, &mode, &dotClock));
+@@ -761,12 +761,12 @@ ProcVidModeModModeLine(ClientPtr client)
+ stuff->flags = oldstuff->flags;
+ stuff->privsize = oldstuff->privsize;
+ }
+- LogMessage(X_INFO, "ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n",
+- (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart,
+- stuff->hsyncend, stuff->htotal);
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
+- stuff->vtotal, (unsigned long) stuff->flags);
++ DebugF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart,
++ stuff->hsyncend, stuff->htotal);
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend,
++ stuff->vtotal, (unsigned long) stuff->flags);
+
+ if (ver < 2) {
+ REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
+@@ -816,7 +816,7 @@ ProcVidModeModModeLine(ClientPtr client)
+ VidModeSetModeValue(modetmp, VIDMODE_FLAGS, stuff->flags);
+
+ if (stuff->privsize)
+- LogMessage(X_INFO, "ModModeLine - Privates in request have been ignored\n");
++ DebugF("ModModeLine - Privates in request have been ignored\n");
+
+ /* Check that the mode is consistent with the monitor specs */
+ switch (pVidMode->CheckModeForMonitor(pScreen, modetmp)) {
+@@ -856,7 +856,7 @@ ProcVidModeModModeLine(ClientPtr client)
+ pVidMode->SetCrtcForMode(pScreen, mode);
+ pVidMode->SwitchMode(pScreen, mode);
+
+- LogMessage(X_INFO, "ModModeLine - Succeeded\n");
++ DebugF("ModModeLine - Succeeded\n");
+ return Success;
+ }
+
+@@ -896,14 +896,14 @@ ProcVidModeValidateModeLine(ClientPtr client)
+ stuff->privsize = oldstuff->privsize;
+ }
+
+- LogMessage(X_INFO, "ValidateModeLine - scrn: %d clock: %ld\n",
+- (int) stuff->screen, (unsigned long) stuff->dotclock);
+- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n",
+- stuff->hdisplay, stuff->hsyncstart,
+- stuff->hsyncend, stuff->htotal);
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
+- (unsigned long) stuff->flags);
++ DebugF("ValidateModeLine - scrn: %d clock: %ld\n",
++ (int) stuff->screen, (unsigned long) stuff->dotclock);
++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ stuff->hdisplay, stuff->hsyncstart,
++ stuff->hsyncend, stuff->htotal);
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
++ (unsigned long) stuff->flags);
+
+ if (ver < 2) {
+ REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
+@@ -956,7 +956,7 @@ ProcVidModeValidateModeLine(ClientPtr client)
+ VidModeSetModeValue(modetmp, VIDMODE_V_TOTAL, stuff->vtotal);
+ VidModeSetModeValue(modetmp, VIDMODE_FLAGS, stuff->flags);
+ if (stuff->privsize)
+- LogMessage(X_INFO, "ValidateModeLine - Privates in request have been ignored\n");
++ DebugF("ValidateModeLine - Privates in request have been ignored\n");
+
+ /* Check that the mode is consistent with the monitor specs */
+ if ((status =
+@@ -982,7 +982,7 @@ ProcVidModeValidateModeLine(ClientPtr client)
+ swapl(&rep.status);
+ }
+ WriteToClient(client, sizeof(xXF86VidModeValidateModeLineReply), &rep);
+- LogMessage(X_INFO, "ValidateModeLine - Succeeded (status = %d)\n", status);
++ DebugF("ValidateModeLine - Succeeded (status = %d)\n", status);
+
+ return Success;
+ }
+@@ -1046,14 +1046,14 @@ ProcVidModeSwitchToMode(ClientPtr client)
+ stuff->privsize = oldstuff->privsize;
+ }
+
+- LogMessage(X_INFO, "SwitchToMode - scrn: %d clock: %ld\n",
+- (int) stuff->screen, (unsigned long) stuff->dotclock);
+- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n",
+- stuff->hdisplay, stuff->hsyncstart,
+- stuff->hsyncend, stuff->htotal);
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
+- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
+- (unsigned long) stuff->flags);
++ DebugF("SwitchToMode - scrn: %d clock: %ld\n",
++ (int) stuff->screen, (unsigned long) stuff->dotclock);
++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ stuff->hdisplay, stuff->hsyncstart,
++ stuff->hsyncend, stuff->htotal);
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n",
++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal,
++ (unsigned long) stuff->flags);
+
+ if (ver < 2) {
+ REQUEST_AT_LEAST_SIZE(xXF86OldVidModeSwitchToModeReq);
+@@ -1089,19 +1089,19 @@ ProcVidModeSwitchToMode(ClientPtr client)
+ return BadValue;
+
+ do {
+- LogMessage(X_INFO, "Checking against clock: %d (%d)\n",
+- VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
+- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n",
+- VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
+- VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
+- VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
+- VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
+- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
+- VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
+- VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
+- VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
+- VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
+- VidModeGetModeValue(mode, VIDMODE_FLAGS));
++ DebugF("Checking against clock: %d (%d)\n",
++ VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock);
++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
++ VidModeGetModeValue(mode, VIDMODE_H_DISPLAY),
++ VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART),
++ VidModeGetModeValue(mode, VIDMODE_H_SYNCEND),
++ VidModeGetModeValue(mode, VIDMODE_H_TOTAL));
++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n",
++ VidModeGetModeValue(mode, VIDMODE_V_DISPLAY),
++ VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART),
++ VidModeGetModeValue(mode, VIDMODE_V_SYNCEND),
++ VidModeGetModeValue(mode, VIDMODE_V_TOTAL),
++ VidModeGetModeValue(mode, VIDMODE_FLAGS));
+
+ if ((pVidMode->GetDotClock(pScreen, stuff->dotclock) == dotClock) &&
+ MODEMATCH(mode, stuff)) {
+@@ -1109,7 +1109,7 @@ ProcVidModeSwitchToMode(ClientPtr client)
+ if (!pVidMode->SwitchMode(pScreen, mode))
+ return BadValue;
+
+- LogMessage(X_INFO, "SwitchToMode - Succeeded\n");
++ DebugF("SwitchToMode - Succeeded\n");
+ return Success;
+ }
+ } while (pVidMode->GetNextModeline(pScreen, &mode, &dotClock));
Reply to: