[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/i810 i810.man, 1.1.4.3, 1.1.4.4 i810_driver.c, 1.1.4.5, 1.1.4.6 i830_driver.c, 1.1.4.4, 1.1.4.5

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/i810

Modified Files:
      Tag: XORG-CURRENT
	i810.man i810_driver.c i830_driver.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: i810.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/i810.man	5 Mar 2004 13:40:24 -0000	1.1.4.3
+++ b/i810.man	15 Apr 2004 10:16:22 -0000	1.1.4.4
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B i810
-is an XFree86 driver for Intel integrated graphics chipsets.
+is an __xservername__ driver for Intel integrated graphics chipsets.
 The driver supports depths 8, 15, 16 and 24.  All visual types are
 supported in depth 8.  For the i810/i815 other depths support the
 TrueColor and DirectColor visuals.  For the 830M and later, only the
@@ -28,7 +28,7 @@
 and 865G chipsets.
 
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
@@ -50,7 +50,8 @@
 entry in the config file
 .B "Device"
 section.  It may be set to any reasonable value up to 64MB for older
-chipsets or 128MB for newer chipets.  It is advisable to check the XFree86
+chipsets or 128MB for newer chipets.  It is advisable to check the
+__xservername__
 log file to check if any features have been disabled because of insufficient
 video memory.  In particular, DRI support or tiling mode may be disabled
 with insufficient video memory.  Either of these being disabled will
@@ -87,7 +88,7 @@
 Default: depends on the resolution, depth, and available video memory.  The
 driver attempts to allocate at least enough to hold two DVD-sized YUV buffers
 by default.  The default used for a specific configuration can be found
-by examining the XFree86 log file.
+by examining the __xservername__ log file.
 .TP
 .BI "Option \*qDRI\*q \*q" boolean \*q
 Disable or enable DRI support.
@@ -135,9 +136,9 @@
 
 
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Keith Whitwell, and also Jonathan Bian, Matthew J Sottek, 
 Jeff Hartmann, Mark Vojkovich, Alan Hourihane, H. J. Lu.  830M and 845G
-support reworked for XFree86 4.3 by David Dawes and Keith Whitwell.
+support reworked originally for XFree86 4.3 by David Dawes and Keith Whitwell.
 852GM, 855GM, and 865G support added by David Dawes and Keith Whitwell.

Index: i810_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/i810_driver.c	5 Mar 2004 13:40:24 -0000	1.1.4.5
+++ b/i810_driver.c	15 Apr 2004 10:16:22 -0000	1.1.4.6
@@ -347,7 +347,7 @@
    MODULEVENDORSTRING,
    MODINFOSTRING1,
    MODINFOSTRING2,
-   XF86_VERSION_CURRENT,
+   XORG_VERSION_CURRENT,
    I810_MAJOR_VERSION, I810_MINOR_VERSION, I810_PATCHLEVEL,
    ABI_CLASS_VIDEODRV,
    ABI_VIDEODRV_VERSION,

Index: i830_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/i830_driver.c	30 Mar 2004 14:23:13 -0000	1.1.4.4
+++ b/i830_driver.c	15 Apr 2004 10:16:22 -0000	1.1.4.5
@@ -1095,7 +1095,8 @@
     int reg = IS_845G(pI830) ? _845_DRAM_RW_CONTROL : _855_DRAM_RW_CONTROL;
     
     if(!pI830->PciInfo 
-       || !(pI830->PciInfo->chipType == PCI_CHIP_I855_GM
+       || !(pI830->PciInfo->chipType == PCI_CHIP_845_G
+	    || pI830->PciInfo->chipType == PCI_CHIP_I855_GM
 	    || pI830->PciInfo->chipType == PCI_CHIP_I865_G))
 	return 0;