X Strike Force XFree86 SVN commit: r2125 - in trunk/debian: . patches
Author: branden
Date: 2005-01-10 15:23:37 -0500 (Mon, 10 Jan 2005)
New Revision: 2125
Added:
trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
Log:
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.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-10 19:32:04 UTC (rev 2124)
+++ trunk/debian/CHANGESETS 2005-01-10 20:23:37 UTC (rev 2125)
@@ -119,4 +119,9 @@
supplying information (updates fix for #261993).
2124
+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
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-10 19:32:04 UTC (rev 2124)
+++ trunk/debian/changelog 2005-01-10 20:23:37 UTC (rev 2125)
@@ -97,8 +97,12 @@
on older (Millenium, Mystique) Matrox cards. Thanks to Jan Gorski for
supplying information (updates fix for #261993).
- -- Branden Robinson <branden@debian.org> Mon, 10 Jan 2005 14:29:58 -0500
+ * 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.
+ -- Branden Robinson <branden@debian.org> Mon, 10 Jan 2005 15:19:57 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Added: trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff
===================================================================
--- trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff 2005-01-10 19:32:04 UTC (rev 2124)
+++ trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff 2005-01-10 20:23:37 UTC (rev 2125)
@@ -0,0 +1,44 @@
+$Id$
+
+The tdfx driver rejects modes without explaining why to the user. Fix this
+by logging the reason.
+
+This patch by Branden Robinson.
+
+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
+@@ -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);
+ 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);
++ 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");
+ 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);
+ return MODE_BAD;
++ }
+ return MODE_OK;
+ }
+
Property changes on: trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: