← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xorg-server/lucid-updates

« back to all changes in this revision

Viewing changes to debian/patches/106_nouveau_autodetect.patch

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen, Bryce Harrington, Robert Hooker, Timo Aaltonen, Robert Collins
  • Date: 2010-02-19 13:24:15 UTC
  • mfrom: (1.1.31 upstream) (0.11.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100219132415-4eovyfajq7ac45n3
Tags: 2:1.7.5-1ubuntu1
[ Bryce Harrington ]
[Robert Hooker]
* Add 106_nouveau_autodetect.patch: makes nouveau the default driver
  for supported cards when not explicitly named in xorg.conf.

[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 101, included in Debian.

[Robert Collins]
* Add 199_xfvb-help-typo.patch to fix typo in help for xvfb (fdo #32990)
* Add 200_randr-null.patch to clarify a pointer initialization (fdo #26389)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/106_nouveau_autodetect.patch
 
1
Index: xserver-xorg-core/hw/xfree86/common/xf86AutoConfig.c
 
2
===================================================================
 
3
--- xserver-xorg-core.orig/hw/xfree86/common/xf86AutoConfig.c   2010-02-01 18:51:54.903592582 +1100
 
4
+++ xserver-xorg-core/hw/xfree86/common/xf86AutoConfig.c        2010-02-01 18:54:14.473621510 +1100
 
5
@@ -192,7 +192,36 @@
 
6
            break;
 
7
        case 0x102b:                driverList[0] = "mga";      break;
 
8
        case 0x10c8:                driverList[0] = "neomagic"; break;
 
9
-       case 0x10de: case 0x12d2:   driverList[0] = "nv";       break;
 
10
+       case 0x10de: case 0x12d2:
 
11
+           switch (dev->device_id) {
 
12
+           /* NV1 - NV2 are unsupported by nouveau, or nv */
 
13
+           case 0x0008:
 
14
+           case 0x0009:
 
15
+           case 0x0010:
 
16
+               driverList[0] = "vesa";
 
17
+               break;
 
18
+           /* NV3 is supported by nv */
 
19
+           case 0x0018:
 
20
+           case 0x0019:
 
21
+               driverList[0] = "nv";
 
22
+               break;
 
23
+           /* Everything else is supported by nouveau */
 
24
+           default:
 
25
+               switch (dev->device_id & 0xfff0) {
 
26
+               /* These integrated cards apparently don't work with the
 
27
+                  nv driver.  Nouveau does support them */
 
28
+               case 0x0840:
 
29
+               case 0x0860:
 
30
+                   driverList[0] = "nouveau";
 
31
+                   break;
 
32
+               default:
 
33
+                   driverList[0] = "nouveau";
 
34
+                   driverList[1] = "nv";
 
35
+                   break;
 
36
+               }
 
37
+               break;
 
38
+           }
 
39
+           break;
 
40
        case 0x1106:                driverList[0] = "openchrome"; break;
 
41
        case 0x1163:                driverList[0] = "rendition"; break;
 
42
        case 0x5333: