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

* Wed Aug 05 2009 Dave Airlie <airlied@redhat.com> 1.6.99-26.20090804

Browse Source 
- fix VGA arb device lookup - noticed by mclasen in qemu
This commit is contained in:
Dave Airlie 2009-08-05 05:55:36 +00:00
parent c165c811da
commit ae50c42136
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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.6.99 Version: 1.6.99
Release: 25.%{gitdate}%{?dist} Release: 26.%{gitdate}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Aug 05 2009 Dave Airlie <airlied@redhat.com> 1.6.99-26.20090804
- fix VGA arb device lookup - noticed by mclasen in qemu
* Tue Aug 04 2009 Dave Airlie <airlied@redhat.com> 1.6.99-25.20090804 * Tue Aug 04 2009 Dave Airlie <airlied@redhat.com> 1.6.99-25.20090804
- fix VGA arb fatal error - fix VGA arb fatal error

14
xserver-1.6.99-vga-arb.patch
View File

@ -1,4 +1,4 @@
From 3e94ca1eb90ded7910edbfa42a63bd832cfa405c Mon Sep 17 00:00:00 2001 From 5900761f4d2d75674d3d303ef37f60a9dcde4309 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com> From: Dave Airlie <airlied@redhat.com>
Date: Mon, 3 Aug 2009 14:09:32 +1000 Date: Mon, 3 Aug 2009 14:09:32 +1000
Subject: [PATCH] X server: VGA arbitration. Subject: [PATCH] X server: VGA arbitration.
@ -225,7 +225,7 @@ index f6138c3..fa24813 100644
} }
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
new file mode 100644 new file mode 100644
index 0000000..6a97b7c index 0000000..bac5183
--- /dev/null --- /dev/null
+++ b/hw/xfree86/common/xf86VGAarbiter.c +++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -0,0 +1,1150 @@ @@ -0,0 +1,1150 @@
@ -355,16 +355,16 @@ index 0000000..6a97b7c
+ int bus, devi, func; + int bus, devi, func;
+ GDevPtr dev_tmp; + GDevPtr dev_tmp;
+ struct pci_device *dev; + struct pci_device *dev;
+ EntityInfoPtr entity;
+ +
+ if (vga_no_arb) + if (vga_no_arb)
+ return; + return;
+ +
+ dev_tmp = xf86GetDevFromEntity(pScrn->entityList[0], + entity = xf86GetEntityInfo(pScrn->entityList[0]);
+ pScrn->entityInstanceList[0]); + if (entity->type != BUS_PCI)
+ sscanf(dev_tmp->busID, "PCI:%d:%d:%d", &bus, &devi, &func); + return;
+ ErrorF("registering PCI:%d:%d:%d with the VGA arbitration\n", bus, devi, func);
+ +
+ dev = pci_device_find_by_slot(0, bus, devi, func); + dev = entity->bus.id.pci;
+ pScrn->vgaDev = dev; + pScrn->vgaDev = dev;
+} +}
+ +