xserver: Branch 'master' - 2 commits

[Daniel Stone]

 dix/main.c                         |   13 +------------
 hw/xfree86/common/xf86AutoConfig.c |    6 +-----
 2 files changed, 2 insertions(+), 17 deletions(-)

New commits:
commit 0dbfe0ebc69c307c0626ba824de15d03de1251d4
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Mon Jul 21 03:50:15 2008 +0300

    Revert "Try nvidia before nv under the assumption that people who install it usually want to *use* it, too."
    
    Per mailing list discussion.
    
    This reverts commit 66fb253082ea42179180303393e48846208987fa.

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index bb52127..45c42e1 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -176,11 +176,7 @@ videoPtrToDriverList(struct pci_device *dev,
 	case 0x102b:		    driverList[0] = "mga";	break;
 	case 0x10c8:		    driverList[0] = "neomagic"; break;
 	case 0x105d:		    driverList[0] = "i128";	break;
-	case 0x12d2:		    driverList[0] = "nv";	break;
-	case 0x10de:
-	    driverList[0] = "nvidia";
-	    driverList[1] = "nv";
-	    break;
+	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
 	case 0x1163:		    driverList[0] = "rendition"; break;
 	case 0x5333:
 	    switch (dev->device_id)
commit 6b5206e7cb8e5279816b48f014d47d3f03f16972
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Fri Jul 18 15:38:10 2008 +0300

    dix: Remove insane BC hacks
    
    If your DDX needs a 1bpp mode and doesn't set it up, your DDX is
    incompetent.

diff --git a/dix/main.c b/dix/main.c
index 2e54030..ab6ca57 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -240,7 +240,7 @@ int dix_main(int argc, char *argv[], char *envp[])
 int main(int argc, char *argv[], char *envp[])
 #endif
 {
-    int		i, j, k;
+    int		i;
     char	*xauthfile;
     HWEventQueueType	alwaysCheckForInput[2];
 
@@ -309,17 +309,6 @@ int main(int argc, char *argv[], char *envp[])
 	if (!WindowTable)
 	    FatalError("couldn't create root window table");
 
-	/*
-	 * Just in case the ddx doesnt supply a format for depth 1 (like qvss).
-	 */
-	j = indexForBitsPerPixel[ 1 ];
-	k = indexForScanlinePad[ BITMAP_SCANLINE_PAD ];
-	PixmapWidthPaddingInfo[1].padRoundUp = BITMAP_SCANLINE_PAD-1;
-	PixmapWidthPaddingInfo[1].padPixelsLog2 = answer[j][k];
- 	j = indexForBitsPerPixel[8]; /* bits per byte */
- 	PixmapWidthPaddingInfo[1].padBytesLog2 = answer[j][k];
-	PixmapWidthPaddingInfo[1].bitsPerPixel = 1;
-
 	InitAtoms();
 	InitEvents();
 	InitSelections();