xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xfree86/common/xf86pciBus.c |   64 +++++++++++++++++++++++++++++++++++------
 hw/xfree86/man/xorg.conf.man   |   11 ++-----
 2 files changed, 60 insertions(+), 15 deletions(-)

New commits:
commit d0a14877872b6a33172fb8c8f335792a28b9499b
Author: Bryce Harrington <bryce at canonical.com>
Date:   Fri Feb 8 15:56:02 2013 -0800

    xfree86: Man page shouldn't say Device is mandatory anymore
    
    man xorg.conf states that the 'Device' identifier is required in the
    'Screen' section, yet current xserver defaults properly and boots up
    fine without it.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=20742
    Signed-off-by: Bryce Harrington <bryce at canonical.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 5d92bbe..9361ce9 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -1821,9 +1821,7 @@ sections have the following format:
 .PP
 The
 .B Identifier
-and
-.B Device
-entries are mandatory.
+entry is mandatory.
 All others are optional.
 .PP
 The
@@ -1841,11 +1839,10 @@ The entries available
 for this section are:
 .TP 7
 .BI "Device  \*q" device\-id \*q
-This mandatory entry specifies the
+This entry specifies the
 .B Device
-section to be used for this screen.
-This is what ties a specific graphics card to a screen.
-The
+section to be used for this screen.  When multiple graphics cards are
+present, this is what ties a specific card to a screen.  The
 .I device\-id
 must match the
 .B Identifier
commit 5e91054aa070ea09b61325b7ec479d767b02730e
Author: Bryce Harrington <bryce at canonical.com>
Date:   Fri Feb 8 15:56:01 2013 -0800

    xfree86: Use fbdev/vesa driver on Oaktrail, Medfield, CDV rather than -intel
    
    Instead of defaulting to -intel for Oaktrail, Medfield, and CDV chips,
    default to -fbdev.  For Poulsbo (only), attempt to use -psb if it's
    installed, and fallback to fbdev otherwise.  All other Intel chips
    should use -intel.
    
    This fixed an issue where -intel would load on these chips and cause a
    boot failure.  Newer -intel drivers avoid the boot hang, but it's still
    the wrong driver to load, so why take chances.
    
    The patch was originally created by Stefan Dirsch for OpenSUSE.  We have
    included it in our stable release (Ubuntu "quantal" 12.10) since
    December.
    
    ref:  https://bugzilla.novell.com/show_bug.cgi?id=772279
    ref:  https://bugs.launchpad.net/ubuntu/+bug/1069031
    Fixes:  https://bugs.freedesktop.org/show_bug.cgi?id=60514
    Signed-off-by: Bryce Harrington <bryce at canonical.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index a2c18eb..258988a 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -1147,14 +1147,62 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
         driverList[0] = "i128";
         break;
     case 0x8086:
-        if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
-            driverList[0] = "i740";
-        }
-        else if (dev->device_id == 0x8108) {
-            break;              /* "hooray" for poulsbo */
-        }
-        else {
-            driverList[0] = "intel";
+	switch (dev->device_id)
+	{
+		/* Intel i740 */
+		case 0x00d1:
+		case 0x7800:
+			driverList[0] = "i740";
+			break;
+		/* GMA500/Poulsbo */
+		case 0x8108:
+		case 0x8109:
+			/* Try psb driver on Poulsbo - if available */
+			driverList[0] = "psb";
+			driverList[1] = "psb_drv";
+			break;
+		/* GMA600/Oaktrail */
+		case 0x4100:
+		case 0x4101:
+		case 0x4102:
+		case 0x4103:
+		case 0x4104:
+		case 0x4105:
+		case 0x4106:
+		case 0x4107:
+		/* Atom E620/Oaktrail */
+		case 0x4108:
+		/* Medfield */
+		case 0x0130:
+		case 0x0131:
+		case 0x0132:
+		case 0x0133:
+		case 0x0134:
+		case 0x0135:
+		case 0x0136:
+		case 0x0137:
+		/* GMA 3600/CDV */
+		case 0x0be0:
+		case 0x0be1:
+		case 0x0be2:
+		case 0x0be3:
+		case 0x0be4:
+		case 0x0be5:
+		case 0x0be6:
+		case 0x0be7:
+		case 0x0be8:
+		case 0x0be9:
+		case 0x0bea:
+		case 0x0beb:
+		case 0x0bec:
+		case 0x0bed:
+		case 0x0bee:
+		case 0x0bef:
+			/* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
+			break;
+		default:
+			driverList[0] = "intel";
+			break;
         }
         break;
     case 0x102b: