Accepting request 128620 from X11:XOrg
- u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
* Do not use intel driver on Poulsbo, Oaktrail, Medfield, CDV.
IDs stolen from Kernel psb driver. (bnc#772279)
* obsoletes xorg-detect-psb.patch
OBS-URL: https://build.opensuse.org/request/show/128620
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=243
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
7b23510d3e
88
u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
Normal file
88
u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
From ec3ce5493ec00ca0a9304b705a58a40e364f88fb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stefan Dirsch <sndirsch@suse.de>
|
||||||
|
Date: Sun, 22 Jul 2012 12:29:51 +0200
|
||||||
|
Subject: [PATCH 3/3] Do not use intel driver on Poulsbo, Oaktrail, Medfield, CDV.
|
||||||
|
|
||||||
|
IDs stolen from Kernel psb driver.
|
||||||
|
---
|
||||||
|
hw/xfree86/common/xf86pciBus.c | 64 +++++++++++++++++++++++++++++++++++-----
|
||||||
|
1 files changed, 56 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
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:
|
||||||
|
--
|
||||||
|
1.7.3.4
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
Index: xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c
|
|
||||||
===================================================================
|
|
||||||
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86pciBus.c
|
|
||||||
+++ xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c
|
|
||||||
@@ -1124,14 +1124,21 @@ videoPtrToDriverList(struct pci_device *
|
|
||||||
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)
|
|
||||||
+ {
|
|
||||||
+ case 0x00d1:
|
|
||||||
+ case 0x7800:
|
|
||||||
+ driverList[0] = "i740";
|
|
||||||
+ break;
|
|
||||||
+ case 0x8109:
|
|
||||||
+ case 0x8108:
|
|
||||||
+ case 0x4102:
|
|
||||||
+ driverList[0] = "psb";
|
|
||||||
+ driverList[1] = "psb_drv";
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ driverList[0] = "intel";
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 0x102b:
|
|
||||||
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jul 22 10:35:59 UTC 2012 - sndirsch@suse.com
|
||||||
|
|
||||||
|
- u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
|
||||||
|
* Do not use intel driver on Poulsbo, Oaktrail, Medfield, CDV.
|
||||||
|
IDs stolen from Kernel psb driver. (bnc#772279)
|
||||||
|
* obsoletes xorg-detect-psb.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jul 17 01:42:30 UTC 2012 - sndirsch@suse.com
|
Tue Jul 17 01:42:30 UTC 2012 - sndirsch@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -165,7 +165,6 @@ Patch162: cache-xkbcomp-output-for-fast-start-up.patch
|
|||||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||||
Patch163: xserver-bg-none-root.patch
|
Patch163: xserver-bg-none-root.patch
|
||||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||||
Patch164: xorg-detect-psb.patch
|
|
||||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||||
Patch200: bug534768-prefer_local_symbols.patch
|
Patch200: bug534768-prefer_local_symbols.patch
|
||||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||||
@ -186,6 +185,7 @@ Patch220: Use-external-tool-for-creating-backtraces-on-crashes.patch
|
|||||||
Patch222: sync-fix.patch
|
Patch222: sync-fix.patch
|
||||||
Patch223: U_glx_Free_reference_to_destroyed_GLX_drawable.patch
|
Patch223: U_glx_Free_reference_to_destroyed_GLX_drawable.patch
|
||||||
Patch224: U_dri2_add_DRI2CreateDrawable2.patch
|
Patch224: U_dri2_add_DRI2CreateDrawable2.patch
|
||||||
|
Patch225: u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch
|
||||||
# Patches to implement GLX_ARB_create_context extensions required for OpenGL 3.0 support
|
# Patches to implement GLX_ARB_create_context extensions required for OpenGL 3.0 support
|
||||||
# http://lists.x.org/archives/xorg-devel/2012-April/030452.html
|
# http://lists.x.org/archives/xorg-devel/2012-April/030452.html
|
||||||
# git://people.freedesktop.org/~idr/xserver.git
|
# git://people.freedesktop.org/~idr/xserver.git
|
||||||
@ -309,7 +309,6 @@ cp %{SOURCE96} .
|
|||||||
#%patch162 -p1
|
#%patch162 -p1
|
||||||
### disabled for now
|
### disabled for now
|
||||||
#%patch163 -p1
|
#%patch163 -p1
|
||||||
%patch164 -p1
|
|
||||||
%patch200 -p1
|
%patch200 -p1
|
||||||
%patch202 -p1
|
%patch202 -p1
|
||||||
%patch203 -p1
|
%patch203 -p1
|
||||||
@ -324,6 +323,7 @@ cp %{SOURCE96} .
|
|||||||
%patch222 -p1
|
%patch222 -p1
|
||||||
%patch223 -p1
|
%patch223 -p1
|
||||||
%patch224 -p1
|
%patch224 -p1
|
||||||
|
%patch225 -p1
|
||||||
%patch300 -p1
|
%patch300 -p1
|
||||||
%patch301 -p1
|
%patch301 -p1
|
||||||
%patch302 -p1
|
%patch302 -p1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user