xserver/hw/kdrive/src kaa.c,1.31,1.32 kmode.c,1.12,1.13

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/tmp/cvs-serv2204/hw/kdrive/src

Modified Files:
	kaa.c kmode.c 
Log Message:
2004-07-26  Keith Packard  <keithp at keithp.com>

	* hw/kdrive/fbdev/fbdev.c: (fbdevModeSupported),
	(fbdevScreenInitialize):
	Eliminate bogus rate check in fbdevModeSupported.
	Hmm.  Potentially bogus rate selection necessary for Mac fbdev

	* hw/kdrive/src/kaa.c: (kaaPixmapSave):
	Don't know about fb changes to pixmaps, so can't track dirt.

	* hw/kdrive/src/kmode.c: (KdFindMode):
	Add Mac specific 1280x854 mode.
	Warn when requested mode isn't found.
	
	* hw/kdrive/vesa/vbe.c: (VbeBoot), (VbeDoInterruptE6):
	* hw/kdrive/vesa/vbe.h:
	* hw/kdrive/vesa/vesa.c: (vesaInitialize), (vesaUseMsg),
	(vesaProcessArgument):
	* hw/kdrive/vesa/vm86.c: (Vm86DoInterrupt), (Vm86DoPOST):
	* hw/kdrive/vesa/vm86.h:
	Add ability to soft-boot video cards.

	* xfixes/region.c: (ProcXFixesExpandRegion),
	(SProcXFixesExpandRegion):
	* xfixes/xfixes.c: (XFixesNumberRequests):
	* xfixes/xfixesint.h:
	Add region expand request.  FIXME: need test cases


Index: kaa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaa.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- kaa.c	3 Jul 2004 09:16:30 -0000	1.31
+++ kaa.c	26 Jul 2004 17:14:26 -0000	1.32
@@ -100,8 +100,10 @@
     pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
     pKaaPixmap->area = NULL;
 
+#if 0
     if (!pKaaPixmap->dirty)
 	return;
+#endif
 
     KdCheckSync (pPixmap->drawable.pScreen);
 

Index: kmode.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kmode.c	14 Jan 2004 10:00:00 -0000	1.12
+++ kmode.c	26 Jul 2004 17:14:26 -0000	1.13
@@ -146,7 +146,13 @@
 		    32,	    208,    384,    KdSyncPositive, /* 61.849 */
 		    1,	    32,	    38,	    KdSyncPositive, /* 65.937 */
     },
-    
+
+    /* 1280x854 modes */
+    {   1280,   854,   103,     12500,			    /* ADDED */
+	            56,     16,     128,    KdSyncPositive, /* 102.554 */
+	            1,     216,     12,     KdSyncPositive,
+    },
+
     /* 1280x960 modes */
     {	1280,	960,	85,	148500,			    /* VESA */
 		    64,	    224,    448,    KdSyncPositive, /* 85.938 */
@@ -263,6 +269,7 @@
 	    return t;
 	}
     }
+    ErrorF("Warning: mode not found, using default\n");
     return &kdMonitorTimings[MONITOR_TIMING_DEFAULT];
 }