rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Tue Feb 10 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-7

Browse Source 
- xserver-1.5.99.902-sod-off-poulsbo.patch: Don't try the intel driver on
  GMA500. (#472674)
This commit is contained in:
Adam Jackson 2009-02-10 15:34:23 +00:00
parent 57da029dc5
commit 38a8c9f78a
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xorg-x11-server.spec
View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.5.99.902 Version: 1.5.99.902
Release: 6%{?dist} Release: 7%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -85,6 +85,9 @@ Patch6011: xserver-1.5.99.902-mediakeys-crash.patch
# ensure HAL can start after X, upstream soon, not 1.6 yet. # ensure HAL can start after X, upstream soon, not 1.6 yet.
Patch6012: xserver-1.5.99.902-listen-for-hal.patch Patch6012: xserver-1.5.99.902-listen-for-hal.patch
# don't try intel on poulsbo
Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch
%define moduledir %{_libdir}/xorg/modules %define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
%define sdkdir %{_includedir}/xorg %define sdkdir %{_includedir}/xorg
@ -501,6 +504,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Feb 10 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-7
- xserver-1.5.99.902-sod-off-poulsbo.patch: Don't try the intel driver on
GMA500. (#472674)
* Tue Feb 10 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-6 * Tue Feb 10 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-6
- xserver-1.5.99.902-listen-for-hal.patch: listen for HAL startup - xserver-1.5.99.902-listen-for-hal.patch: listen for HAL startup
notifications if it isn't running already. notifications if it isn't running already.

26
xserver-1.5.99.902-sod-off-poulsbo.patch Normal file
View File

@ -0,0 +1,26 @@
From c799dd4390e5ea301c8f4f81784ac590b97f7a07 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 10 Feb 2009 10:25:19 -0500
Subject: [PATCH] autoconfig: ignore poulsbo
Thanks, Intel.
---
hw/xfree86/common/xf86AutoConfig.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index a9a1fd2..19c06c8 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -171,6 +171,8 @@ videoPtrToDriverList(struct pci_device *dev,
case 0x8086:
if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
driverList[0] = "i740";
+ } else if (dev->device_id == 0x8108) {
+ break; /* you got powervr in my intel! */
} else {
driverList[0] = "intel";
driverList[1] = "i810";
--
1.6.1.2