[xserver-commit] xserver ChangeLog,3.71,3.72 configure.ac,3.38,3.39

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver
In directory pdx:/home/anholt/xserver

Modified Files:
	ChangeLog configure.ac 
Log Message:
- Add fbdev mode-setting backend to Xati.  It and vesa are compiled
  in when available, with fbdev being used by default.
- Use depth 16 by default when vesa backend is used.
- Add MMIO defines for PowerPC (should be in a common location).

Many thanks for Michel Daenzer for much of this code.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.71
retrieving revision 3.72
diff -u -d -r3.71 -r3.72
--- ChangeLog	1 Dec 2003 03:15:05 -0000	3.71
+++ ChangeLog	1 Dec 2003 04:33:30 -0000	3.72
@@ -1,5 +1,26 @@
 2003-11-30  Eric Anholt  <anholt@FreeBSD.org>
 
+	* configure.ac:
+	* hw/kdrive/Makefile.am:
+	* hw/kdrive/ati/Makefile.am:
+	* hw/kdrive/ati/ati.c: (ATICardInit), (ATICardFini),
+	(ATIScreenInit), (ATIScreenFini), (ATIInitScreen),
+	(ATIFinishInitScreen), (ATICreateResources), (ATIPreserve),
+	(ATIRestore), (ATIDPMS), (ATIEnable), (ATIDisable), (ATIGetColors),
+	(ATIPutColors):
+	* hw/kdrive/ati/ati.h:
+	* hw/kdrive/ati/ati_stub.c: (ddxUseMsg), (ddxProcessArgument):
+	* hw/kdrive/fbdev/fbdev.c: (fbdevInitialize):
+	* hw/kdrive/src/kdrive.h:
+	- Add fbdev mode-setting backend to Xati.  It and vesa are compiled
+	  in when available, with fbdev being used by default.
+	- Use depth 16 by default when vesa backend is used.
+	- Add MMIO defines for PowerPC (should be in a common location).
+
+	Many thanks for Michel Daenzer for much of this code.
+
+2003-11-30  Eric Anholt  <anholt@FreeBSD.org>
+
 	* hw/kdrive/ati/ati.c:
 	Add more RV250 PCI IDs.
 

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.38
retrieving revision 3.39
diff -u -d -r3.38 -r3.39
--- configure.ac	22 Nov 2003 02:19:44 -0000	3.38
+++ configure.ac	1 Dec 2003 04:33:30 -0000	3.39
@@ -64,6 +64,9 @@
 # APM header
 AC_CHECK_HEADERS([linux/apm_bios.h])
 
+# fbdev header
+AC_CHECK_HEADERS([linux/fb.h])
+
 # MTRR header
 AC_CHECK_HEADERS([asm/mtrr.h])
 
@@ -221,12 +224,17 @@
 if test "$USE_RGB_BUILTIN" = yes; then
 	AC_DEFINE(USE_RGB_BUILTIN,1,[Use builtin rgb color database])
 fi
-	
+
 if test "$ac_cv_header_sys_vm86_h" = yes; then
-	AC_DEFINE(KDRIVEVESA, 1, [Include vesa-based X servers])
+	AC_DEFINE(KDRIVEVESA, 1, [Include vesa support in X servers])
 fi
 AM_CONDITIONAL(KDRIVEVESA, [test "$ac_cv_header_sys_vm86_h" = yes])
 
+if test "$ac_cv_header_linux_fb_h" = yes; then
+	AC_DEFINE(KDRIVEFBDEV, 1, [Include framebuffer support in X servers])
+fi
+AM_CONDITIONAL(KDRIVEFBDEV, [test "$ac_cv_header_linux_fb_h" = yes])
+
 AC_DEFINE_UNQUOTED(COMPILEDDEFAULTFONTPATH, ["$FONTPATH"], [Default font path])
 AC_DEFINE_UNQUOTED(VENDOR_STRING,["$VENDOR_STRING"], [Vendor name])
 AC_DEFINE_UNQUOTED(VENDOR_RELEASE, [$VENDOR_RELEASE], [Vendor release])