diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-01-16 23:20:51 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-01-16 23:20:51 +0000 |
| commit | 118ae10dad527887b5d3e90f4dbaff23f0d87177 (patch) | |
| tree | 1d6e75d3f203c347dfd7a6a6a5aa1d927dcfd417 /xserver/hw/xfree86/common/xf86AutoConfig.c | |
| parent | 4b54289a800db0fd47bb7a236200726225a67835 (diff) | |
Based on a suggestion and an initial patch by kettenis@, build
both the old i810 and the new intel drivers on i386, and let X
autoconfiguration code choose the one that is used based on the chipset.
Tested by landry@ and a few others.
Diffstat (limited to 'xserver/hw/xfree86/common/xf86AutoConfig.c')
| -rw-r--r-- | xserver/hw/xfree86/common/xf86AutoConfig.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/xserver/hw/xfree86/common/xf86AutoConfig.c b/xserver/hw/xfree86/common/xf86AutoConfig.c index 4f6a98aef..a2c9c5d0e 100644 --- a/xserver/hw/xfree86/common/xf86AutoConfig.c +++ b/xserver/hw/xfree86/common/xf86AutoConfig.c @@ -173,9 +173,17 @@ videoPtrToDriverName(pciVideoPtr info) case 0x102c: return "chips"; case 0x1013: return "cirrus"; case 0x8086: - if ((info->chipType == 0x00d1) || (info->chipType == 0x7800)) - return "i740"; - else return "i810"; + switch (info->chipType) + { + case 0x00d1: case 0x7800: + return "i740"; + case 0x1132: case 0x2562: case 0x2572: case 0x3577: + case 0x3582: case 0x358e: case 0x7121: case 0x7123: + case 0x7125: + return "i810"; + default: + return "intel"; + } case 0x102b: return "mga"; case 0x10c8: return "neomagic"; case 0x105d: return "i128"; |