Author: branden
Date: 2005-01-12 02:11:51 -0500 (Wed, 12 Jan 2005)
New Revision: 2132
Modified:
trunk/debian/CHANGESETS
trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff
Log:
Fix idiocy in patch.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-12 06:02:36 UTC (rev 2131)
+++ trunk/debian/CHANGESETS 2005-01-12 07:11:51 UTC (rev 2132)
@@ -125,7 +125,7 @@
Fix the tdfx driver to stop failing to explain why some modes are
rejected. If TDFXValidMode() would return MODE_BAD, use xf86DrvMsg() to
document the reason.
- 2125
+ 2125, 2132
Fix xlsfonts, xprop, xwd, and xwininfo to not bleat a usage message when
XOpenDisplay() fails. Being unable to connect to the X server is an
Modified: trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff
===================================================================
--- trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff
2005-01-12 06:02:36 UTC (rev 2131)
+++ trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff
2005-01-12 07:11:51 UTC (rev 2132)
@@ -7,36 +7,36 @@
Not submitted upstream to XFree86 or X.Org.
---- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c~ 2005-01-10
15:03:35.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c 2005-01-10
15:13:17.000000000 -0500
+--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c~ 2005-01-12
02:09:12.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c 2005-01-12
02:09:22.000000000 -0500
@@ -2393,14 +2393,29 @@
static int
TDFXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) {
TDFXTRACE("TDFXValidMode start\n");
- if ((mode->HDisplay>2048) || (mode->VDisplay>1536))
+ if (mode->HDisplay>2048) {
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with horizontal"
-+ " resolution %d exceeding maximum of 2048\n", mode->HDisplay);
++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution
%d"
++ " exceeding maximum of 2048\n", mode->HDisplay);
return MODE_BAD;
+ }
+ if (mode->VDisplay>1536) {
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with vertical"
-+ " resolution %d exceeding maximum of 1536\n", mode->VDisplay);
++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with vertical resolution %d"
++ " exceeding maximum of 1536\n", mode->VDisplay);
+ return MODE_BAD;
+ }
/* Banshee doesn't support interlace. Does V3? */
- if (mode->Flags&V_INTERLACE)
+ if (mode->Flags&V_INTERLACE) {
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with unsupported"
-+ " interlace flag\n");
++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with unsupported interlace"
++ " flag\n");
return MODE_BAD;
+ }
/* In clock doubled mode widths must be divisible by 16 instead of 8 */
- if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16))
+ if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16)) {
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with horizontal"
-+ " resolution %d not divisibile by 16 and clock %d greater than"
-+ " %d\n", mode->HDisplay, mode->Clock, TDFX2XCUTOFF);
++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution
%d"
++ " not divisibile by 16 and clock %d greater than %d\n",
++ mode->HDisplay, mode->Clock, TDFX2XCUTOFF);
return MODE_BAD;
+ }
return MODE_OK;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
