Merged changes from RELEASE-1 branchXORG-CURRENT-CLOSED

4 files changed, 15 insertions, 11 deletions

diff --git a/README.sgml b/README.sgml
index 7782a87d..2aba95fd 100644
--- a/README.sgml
+++ b/README.sgml
@@ -71,14 +71,14 @@ More up to date information about the i810 driver can be found in the
 <p>
 The driver auto-detects all device information necessary to
 initialize the card.  The only lines you need in the "Device"
-section of your XF86Config file are:
+section of your xorg.conf file are:
 <verb>
        Section "Device"
            Identifier "Intel i810"
            Driver     "i810"
        EndSection
 </verb>
-or let <tt>xf86config</tt> do this for you.
+or let <tt>xorgconfig</tt> do this for you.
 
 However, if you have problems with auto-detection, you can specify:
 <itemize>
@@ -120,7 +120,9 @@ capable server.
    <item>Keith Whitwell
 </itemize>
 
-This driver was donated to The XFree86 Project by:
+The X11R&relvers; version of this driver originally came from XFree86 4.4 rc2.
+
+The XFree86 version of this driver was donated to The XFree86 Project by:
 <verb>
     Precision Insight, Inc.
     Cedar Park, TX
diff --git a/man/i810.man b/man/i810.man
index 321d9934..98bdf8f0 100644
--- a/man/i810.man
+++ b/man/i810.man
@@ -14,7 +14,7 @@ i810 \- Intel 8xx integrated graphics chipsets
 .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 @@ supports the i810, i810-DC100, i810e, i815, 830M, 845G, 852GM, 855GM,
 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 @@ DRI is enabled.  This amount may be changed with the
 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 @@ textures.  Increasing it can improve 2D performance at the expense of
 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 @@ configurations where it is supported.
 
 
 .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.
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 73ddd1b3..0d07f296 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -347,7 +347,7 @@ static XF86ModuleVersionInfo i810VersRec = {
    MODULEVENDORSTRING,
    MODINFOSTRING1,
    MODINFOSTRING2,
-   XF86_VERSION_CURRENT,
+   XORG_VERSION_CURRENT,
    I810_MAJOR_VERSION, I810_MINOR_VERSION, I810_PATCHLEVEL,
    ABI_CLASS_VIDEODRV,
    ABI_VIDEODRV_VERSION,
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 3552fbc3..a96ada52 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1095,7 +1095,8 @@ TweakMemorySize(ScrnInfoPtr pScrn, CARD32 newsize, Bool preinit)
     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;