xorg-server: Changes to 'ubuntu-raring'
debian/changelog | 1 +
debian/patches/series | 1 +
debian/patches/xf86-inactive-gpuscreen.patch | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
New commits:
commit 1bf673011f14739b3fe75edaf014d45eac81f739
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Jun 25 15:07:28 2013 +0200
add fix for the xorg.conf regression with detection fixed up
diff --git a/debian/changelog b/debian/changelog
index f86d33c..d49973b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.13.3-0ubuntu6.1) UNRELEASED; urgency=low
- xf86-detach-scanout.patch
* Add patch to fix device enumeration with nvidia drivers. (LP: #1190546)
- xf86-fixup-detection.patch
+ - xf86-inactive-gpuscreen.patch
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Wed, 01 May 2013 10:35:55 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 38a1533..a8d6a8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,6 +44,7 @@ include-GPU-screens-in-DPMS-code.patch
# hybrid graphics fixes for xserver 1.13
228_autobind_gpu.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: