open-src/xserver/xorg/25172489.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Tue, 29 Nov 2016 19:56:07 -0800
changeset 1682 4219397bd81c
child 1696 486a9521e7bf
permissions -rw-r--r--
25172489 Deliver the modesetting driver on x86
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1682
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     1
Start delivering modesetting driver and use it instead of the intel driver
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     2
This is hopefully a stop-gap arrangement for intel/gnome3 issues we are seeing
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     3
in 24957951
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     4
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     5
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     6
--- a/hw/xfree86/common/xf86AutoConfig.c	2016-11-23 13:43:11.296630988 -0800
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     7
+++ b/hw/xfree86/common/xf86AutoConfig.c	2016-11-29 12:30:27.169057559 -0800
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     8
@@ -249,7 +249,7 @@
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     9
         i += xf86PciMatchDriver(&matches[i], nmatches - i);
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    10
 #endif
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    11
 
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    12
-#if defined(__linux__)
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    13
+#if defined(__linux__) || defined(__sun)
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    14
     matches[i++] = xnfstrdup("modesetting");
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    15
 #endif
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    16
 
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    17
--- a/hw/xfree86/common/xf86pciBus.c	2016-11-23 13:43:11.296988337 -0800
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    18
+++ b/hw/xfree86/common/xf86pciBus.c	2016-11-29 16:01:15.432926626 -0800
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    19
@@ -1222,7 +1222,7 @@
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    20
 			/* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    21
 			break;
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    22
 		default:
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    23
-			driverList[0] = "intel";
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    24
+			driverList[0] = "modesetting";
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    25
 			break;
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    26
         }
4219397bd81c 25172489 Deliver the modesetting driver on x86
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    27
         break;