debian/changelog | 11 ++++
debian/patches/230-fix-compat-output-selection.patch | 33 +++++++++++++
debian/patches/231-scan-pci-after-probing-devices.patch | 38 ++++++++++++++++
debian/patches/series | 2
4 files changed, 84 insertions(+)
New commits:
commit c25e0c2600242b200adc732a8bf3c903af7b9c99
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Sep 20 14:55:46 2012 +0300
release to quantal
diff --git a/debian/changelog b/debian/changelog
index 733aa0f..78583a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.13.0-0ubuntu4) UNRELEASED; urgency=low
+xorg-server (2:1.13.0-0ubuntu4) quantal; urgency=low
* Add patches to fix issues with hybrid graphics:
- 230-fix-compat-output-selection.patch
commit 9f6c22d850fe5db6a5cbc4f2ed5862f2fe996c58
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Sep 20 14:48:56 2012 +0300
Add patches to fix issues with hybrid graphics
* Add patches to fix issues with hybrid graphics:
- 230-fix-compat-output-selection.patch
Fix compat output selection when the GPU has no outputs
(LP: #1043458)
- 231-scan-pci-after-probing-devices.patch
Fix a race condition when dynamically powering off secondary GPU's
diff --git a/debian/changelog b/debian/changelog
index 6b94c18..733aa0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.13.0-0ubuntu4) UNRELEASED; urgency=low
+
+ * Add patches to fix issues with hybrid graphics:
+ - 230-fix-compat-output-selection.patch
+ Fix compat output selection when the GPU has no outputs
+ (LP: #1043458)
+ - 231-scan-pci-after-probing-devices.patch
+ Fix a race condition when dynamically powering off secondary GPU's
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 20 Sep 2012 14:34:45 +0300
+
xorg-server (2:1.13.0-0ubuntu3) quantal; urgency=low
* Try again with the right hotplug patch.
diff --git a/debian/patches/230-fix-compat-output-selection.patch
b/debian/patches/230-fix-compat-output-selection.patch
new file mode 100644
index 0000000..893d10e
--- /dev/null
+++ b/debian/patches/230-fix-compat-output-selection.patch
@@ -0,0 +1,33 @@
+From 37d956e3ac9513b74078882dff489f9b0a7a5a28 Mon Sep 17 00:00:00 2001
+From: Keith Packard <kei...@keithp.com>
+Date: Mon, 10 Sep 2012 01:14:20 +0000
+Subject: xf86: fix compat output selection for no output GPUs
+
+This should work properly with dynamic outputs.
+
+Reviewed-by: Dave Airlie <airl...@redhat.com>
+Signed-off-by: Dave Airlie <airl...@redhat.com>
+---
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index e3eaf5f..177f7ac 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -66,6 +66,7 @@ xf86CrtcConfigInit(ScrnInfoPtr scrn, const
xf86CrtcConfigFuncsRec * funcs)
+ config = xnfcalloc(1, sizeof(xf86CrtcConfigRec));
+
+ config->funcs = funcs;
++ config->compat_output = -1;
+
+ scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config;
+ }
+@@ -1841,7 +1842,7 @@ SetCompatOutput(xf86CrtcConfigPtr config)
+ if (compat >= 0) {
+ config->compat_output = compat;
+ }
+- else {
++ else if (config->compat_output >= 0 && config->compat_output <
config->num_output) {
+ /* Don't change the compat output when no valid outputs found */
+ output = config->output[config->compat_output];
+ }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/231-scan-pci-after-probing-devices.patch
b/debian/patches/231-scan-pci-after-probing-devices.patch
new file mode 100644
index 0000000..0e32ea8
--- /dev/null
+++ b/debian/patches/231-scan-pci-after-probing-devices.patch
@@ -0,0 +1,38 @@
+From 10672a5abe7d4e924844d7e41c86c24d6367a52b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airl...@redhat.com>
+Date: Mon, 10 Sep 2012 04:48:37 +0000
+Subject: xf86/platform: scan pci after probing devices
+
+This solves a race if we are trying to dynamically power off
+secondary GPUs. Its not the greatest fix ever but it probably
+as good as we can do for now.
+
+The GPU probing causes the devices to be powered up, then when
+we scan the PCI bus we get the correct information from the kernel,
+rather than a bunch of 0xff due to the device being powered off.
+
+drop gratuitous '&'.
+
+Reviewed-by: Keith Packard <kei...@keithp.com>
+Signed-off-by: Dave Airlie <airl...@redhat.com>
+---
+diff --git a/hw/xfree86/common/xf86platformBus.c
b/hw/xfree86/common/xf86platformBus.c
+index 24b9473..6a8fb90 100644
+--- a/hw/xfree86/common/xf86platformBus.c
++++ b/hw/xfree86/common/xf86platformBus.c
+@@ -213,11 +213,12 @@ xf86platformProbe(void)
+ int i;
+ Bool pci = TRUE;
+
++ config_odev_probe(xf86PlatformDeviceProbe);
++
+ if (!xf86scanpci()) {
+ pci = FALSE;
+ }
+
+- config_odev_probe(&xf86PlatformDeviceProbe);
+ for (i = 0; i < xf86_num_platform_devices; i++) {
+ char *busid = xf86_get_platform_attrib(i, ODEV_ATTRIB_BUSID);
+
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/series b/debian/patches/series
index f5c0b24..8609e8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,6 +21,8 @@
227_null_ptr_midispcur.patch
228_autobind_gpu.patch
229_udev-fix.diff
+230-fix-compat-output-selection.patch
+231-scan-pci-after-probing-devices.patch
# Temporary, until it's reviewed & accepted upstream
500_pointer_barrier_thresholds.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tefmi-00075v...@vasks.debian.org
