xorg-server: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/patches/series | 3 ++-
debian/patches/xf86-inactive-gpuscreen.patch | 26 ++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
New commits:
commit ba80c0db09fc5c8ee794f83d7bccd88574f50cbe
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Jun 17 14:17:10 2013 +0200
Add patch to fix nvidia regression.
xf86-inactive-gpuscreen.patch
diff --git a/debian/changelog b/debian/changelog
index aea1674..4d243aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.13.3-0ubuntu13) saucy; urgency=low
+
+ * Re-enable xf86-fixup-detection.patch.
+ * Add patch to fix nvidia regression.
+ - xf86-inactive-gpuscreen.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 17 Jun 2013 14:16:05 +0200
+
xorg-server (2:1.13.3-0ubuntu12) saucy; urgency=low
* Disable xf86-fixup-detection.patch for now as it breaks PRIME
diff --git a/debian/patches/series b/debian/patches/series
index 34abd18..c6e43c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,7 +44,8 @@ include-GPU-screens-in-DPMS-code.patch
# hybrid graphics fixes for xserver 1.13
228_autobind_gpu.patch
-#xf86-fixup-detection.patch
+xf86-fixup-detection.patch
+xf86-inactive-gpuscreen.patch
# hotplug fixes
xfree86-hotplug-cleanup-properly-if-the-screen-fails.patch
diff --git a/debian/patches/xf86-inactive-gpuscreen.patch b/debian/patches/xf86-inactive-gpuscreen.patch
new file mode 100644
index 0000000..11ffec4
--- /dev/null
+++ b/debian/patches/xf86-inactive-gpuscreen.patch
@@ -0,0 +1,26 @@
+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
+index c790d50..a47c2d0 100644
+--- a/hw/xfree86/common/xf86platformBus.c
++++ b/hw/xfree86/common/xf86platformBus.c
+@@ -387,7 +387,7 @@ xf86platformProbeDev(DriverPtr drvp)
+ Bool foundScreen = FALSE;
+ GDevPtr *devList;
+ const unsigned numDevs = xf86MatchDevice(drvp->driverName, &devList);
+- int i, j;
++ int i, j, flags;
+
+ /* find the main device or any device specificed in xorg.conf */
+ for (i = 0; i < numDevs; i++) {
+@@ -415,7 +415,11 @@ xf86platformProbeDev(DriverPtr drvp)
+ if (j == xf86_num_platform_devices)
+ continue;
+
+- foundScreen = probeSingleDevice(&xf86_platform_devices[j], drvp, devList[i], 0);
++ flags = 0;
++ if (!devList[i]->active)
++ flags |= PLATFORM_PROBE_GPU_SCREEN;
++
++ foundScreen = probeSingleDevice(&xf86_platform_devices[j], drvp, devList[i], flags);
+ if (!foundScreen)
+ continue;
+ }
Reply to: