X Strike Force X.Org X11 SVN commit: r1325 - in branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian: . patches
Author: dnusinow
Date: 2006-02-26 18:03:36 -0500 (Sun, 26 Feb 2006)
New Revision: 1325
Added:
branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
Modified:
branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/changelog
branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/series
Log:
* Port patches from trunk
+ general/099q_tdfx_improve_mode_rejection_diagnostics.diff
Modified: branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/changelog
===================================================================
--- branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/changelog 2006-02-26 23:00:21 UTC (rev 1324)
+++ branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/changelog 2006-02-26 23:03:36 UTC (rev 1325)
@@ -2,8 +2,9 @@
* Port patches from trunk
+ general/035_tdfx_disable_dri_on_16mb_with_highres.diff
+ + general/099q_tdfx_improve_mode_rejection_diagnostics.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 17:59:47 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 18:03:00 -0500
xserver-xorg-video-tdfx (1:1.1.1.3-1) experimental; urgency=low
Added: branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
===================================================================
--- branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff 2006-02-26 23:00:21 UTC (rev 1324)
+++ branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff 2006-02-26 23:03:36 UTC (rev 1325)
@@ -0,0 +1,43 @@
+Index: xf86-video-tdfx-X11R7.0-1.1.1.3/src/tdfx_driver.c
+===================================================================
+--- xf86-video-tdfx-X11R7.0-1.1.1.3.orig/src/tdfx_driver.c 2006-01-12 22:55:59.000000000 -0500
++++ xf86-video-tdfx-X11R7.0-1.1.1.3/src/tdfx_driver.c 2006-02-26 18:02:43.000000000 -0500
+@@ -2410,8 +2410,16 @@
+ TDFXPtr pTDFX;
+
+ TDFXTRACE("TDFXValidMode start\n");
+- if ((mode->HDisplay>2048) || (mode->VDisplay>1536))
++ if (mode->HDisplay>2048) {
++ 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(scrnIndex, X_INFO, "rejecting mode with vertical resolution %d"
++ " exceeding maximum of 1536\n", mode->VDisplay);
++ return MODE_BAD;
++ }
+ /* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
+ pScrn = xf86Screens[scrnIndex];
+ pTDFX = TDFXPTR(pScrn);
+@@ -2425,13 +2433,19 @@
+ return MODE_OK;
+ break;
+ default:
++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with unsupported"
++ " interlace flag\n");
+ return MODE_BAD;
+ break;
+ }
+ }
+ /* 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(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;
+ }
+
Modified: branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/series
===================================================================
--- branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/series 2006-02-26 23:00:21 UTC (rev 1324)
+++ branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/series 2006-02-26 23:03:36 UTC (rev 1325)
@@ -1 +1,2 @@
01_tdfx_disable_dri_on_16mb_with_highres.diff
+02_tdfx_improve_mode_rejection_diagnostics.diff
Reply to: