debian/changelog | 8 +++
debian/patches/series | 1
debian/patches/xfree86-pci-bus-probe-non-seat0.patch | 44 +++++++++++++++++++
3 files changed, 53 insertions(+)
New commits:
commit 199ac5c8e3701320d4e4c865df825b161bb1e07c
Author: Alberts Muktupāvels <alberts.muktupav...@gmail.com>
Date: Tue Jul 1 17:12:51 2014 +0300
Upstream patch to fix "No devices detected" error for seats other than
seat0. (LP: #1209008)
diff --git a/debian/changelog b/debian/changelog
index d29c7a7..37a86c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.15.1-0ubuntu7) utopic; urgency=medium
+
+ * debian/patches/xfree86-pci-bus-probe-non-seat0.patch
+ - Upstream patch to fix "No devices detected" error for seats
+ other than seat0. (LP: #1209008)
+
+ -- Alberts Muktupāvels <alberts.muktupav...@gmail.com> Tue, 01 Jul 2014
17:12:51 +0300
+
xorg-server (2:1.15.1-0ubuntu6) utopic; urgency=medium
* ppc64el-endian-fix.patch: Fix PPC endian assumptions (LP: #1333422)
diff --git a/debian/patches/series b/debian/patches/series
index 9fa55f1..0db02d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,3 +56,4 @@ xi2-resize-touch.patch
xi-dont-copy-too-much.patch
mi-dont-process-disabled.patch
ppc64el-endian-fix.patch
+xfree86-pci-bus-probe-non-seat0.patch
diff --git a/debian/patches/xfree86-pci-bus-probe-non-seat0.patch
b/debian/patches/xfree86-pci-bus-probe-non-seat0.patch
new file mode 100644
index 0000000..50718cb
--- /dev/null
+++ b/debian/patches/xfree86-pci-bus-probe-non-seat0.patch
@@ -0,0 +1,44 @@
+From 29b1484bb9555e45067669cbfe68a3c40596f4ff Mon Sep 17 00:00:00 2001
+From: Laércio de Sousa <lbsous...@gmail.com>
+Date: Thu, 03 Apr 2014 14:19:13 +0000
+Subject: xfree86: allow fallback to PCI bus probe for graphics devices on
non-seat0 X servers (#66851)
+
+Currently non-seat0 X servers only probe platform bus for graphics devices,
+which is OK for most KMS-compliant drivers. However, for non-KMS drivers
+(like NVIDIA proprietary ones), graphics devices can't be reached
+by platform bus probe, resulting in a "No devices detected" error.
+
+This patch allows a fallback to PCI bus probe for non-seat0 X servers
+in case no platform bus graphics device is found.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=66851
+
+Signed-off-by: Laércio de Sousa <lbsous...@gmail.com>
+Reviewed-by: Hans de Goede <hdego...@redhat.com>
+Reviewed-by: Dave Airlie <airl...@redhat.com>
+Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+---
+diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
+index 507c57d..b3b3f8c 100644
+--- a/hw/xfree86/common/xf86Bus.c
++++ b/hw/xfree86/common/xf86Bus.c
+@@ -81,7 +81,7 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
+ if (drv->platformProbe != NULL) {
+ foundScreen = xf86platformProbeDev(drv);
+ }
+- if (ServerIsNotSeat0())
++ if (ServerIsNotSeat0() && foundScreen)
+ return foundScreen;
+ #endif
+
+@@ -201,7 +201,7 @@ xf86BusProbe(void)
+ {
+ #ifdef XSERVER_PLATFORM_BUS
+ xf86platformProbe();
+- if (ServerIsNotSeat0())
++ if (ServerIsNotSeat0() && xf86_num_platform_devices > 0)
+ return;
+ #endif
+ #ifdef XSERVER_LIBPCIACCESS
+--
+cgit v0.9.0.2-2-gbebe
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1x2cgk-000312...@moszumanska.debian.org
