Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2012-07-23 10:46:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server", Maintainer is "sndir...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2012-07-18 17:53:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2012-07-23 10:46:59.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Jul 22 10:35:59 UTC 2012 - sndir...@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 + +------------------------------------------------------------------- Old: ---- xorg-detect-psb.patch New: ---- u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.IPn2wm/_old 2012-07-23 10:47:01.000000000 +0200 +++ /var/tmp/diff_new_pack.IPn2wm/_new 2012-07-23 10:47:01.000000000 +0200 @@ -165,7 +165,6 @@ # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch163: xserver-bg-none-root.patch # 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 Patch200: bug534768-prefer_local_symbols.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -186,6 +185,7 @@ Patch222: sync-fix.patch Patch223: U_glx_Free_reference_to_destroyed_GLX_drawable.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 # http://lists.x.org/archives/xorg-devel/2012-April/030452.html # git://people.freedesktop.org/~idr/xserver.git @@ -309,7 +309,6 @@ #%patch162 -p1 ### disabled for now #%patch163 -p1 -%patch164 -p1 %patch200 -p1 %patch202 -p1 %patch203 -p1 @@ -324,6 +323,7 @@ %patch222 -p1 %patch223 -p1 %patch224 -p1 +%patch225 -p1 %patch300 -p1 %patch301 -p1 %patch302 -p1 ++++++ u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch ++++++ >From ec3ce5493ec00ca0a9304b705a58a40e364f88fb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <sndir...@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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
