* Tue Jul 28 2009 Adam Jackson <ajax@redhat.com> 1.6.99-20.20090724

- xserver-1.6.99-use-pci-access-boot.patch: Some chips (thanks Intel) will
  change their PCI class at runtime if you disable their VGA decode, so
  consider both 0x0300 and 0x0380 classes when looking for the boot VGA.
This commit is contained in:
Adam Jackson 2009-07-28 14:33:20 +00:00
parent f2af5d5067
commit 34b04ed531
2 changed files with 28 additions and 6 deletions

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.6.99 Version: 1.6.99
Release: 19.%{gitdate}%{?dist} Release: 20.%{gitdate}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -525,6 +525,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Jul 28 2009 Adam Jackson <ajax@redhat.com> 1.6.99-20.20090724
- xserver-1.6.99-use-pci-access-boot.patch: Some chips (thanks Intel) will
change their PCI class at runtime if you disable their VGA decode, so
consider both 0x0300 and 0x0380 classes when looking for the boot VGA.
* Tue Jul 28 2009 Adam Jackson <ajax@redhat.com> 1.6.99-19.20090724 * Tue Jul 28 2009 Adam Jackson <ajax@redhat.com> 1.6.99-19.20090724
- xserver-1.6.99-randr-error-debugging.patch: Dump RANDR protocol errors - xserver-1.6.99-randr-error-debugging.patch: Dump RANDR protocol errors
to the log. to the log.

View File

@ -1,20 +1,37 @@
From 30f5e00909399b4503009e32831127d72d34f5df Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com> From: Dave Airlie <airlied@redhat.com>
Date: Tue, 3 Mar 2009 10:58:33 -0500 Date: Tue, 3 Mar 2009 10:58:33 -0500
Subject: [PATCH] Primary video device hack - the revenge Subject: [PATCH] Primary video device hack - the revenge
---
hw/xfree86/common/xf86pciBus.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 8ed3567..183b1ba 100644 index 8ed3567..74aeb44 100644
--- a/hw/xfree86/common/xf86pciBus.c --- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c
@@ -60,7 +60,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw *
/* PCI classes that get included in xf86PciVideoInfo */
#define PCIINFOCLASSES(c) \
( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \
- || (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) )
+ || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) )
/*
* PCI classes that have messages printed always. The others are only
@@ -400,6 +400,11 @@ xf86PciProbe(void) @@ -400,6 +400,11 @@ xf86PciProbe(void)
xf86PciVideoInfo[num - 1] = info; xf86PciVideoInfo[num - 1] = info;
pci_device_probe(info); pci_device_probe(info);
+ +
+ if (pci_device_is_boot_vga(info)) { + if (pci_device_is_boot_vga(info)) {
+ primaryBus.type = BUS_PCI; + primaryBus.type = BUS_PCI;
+ primaryBus.id.pci = info; + primaryBus.id.pci = info;
+ } + }
info->user_data = 0; info->user_data = 0;
} }
} }
--
1.6.3.3