forked from pool/xorg-x11-server
Stefan Dirsch
a29b6ab496
- Add new patches to make non-seat0 X servers work properly with non-KMS video drivers: + u_xfree86-allow-fallback-to-PCI-bus-probe-for-non-seat0-seats.patch + u_xfree86-add-new-key-MatchSeat-to-xorg-conf.patch + u_xfree86-add-short-description-about-MatchSeat-key-in-xorg-conf-man-page.patch OBS-URL: https://build.opensuse.org/request/show/232245 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=513
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 04ad4d4010a562a663ee3224b55d2b9c8468bd0e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= <lbsousajr@gmail.com>
|
|
Date: Thu, 3 Apr 2014 09:14:36 -0300
|
|
Subject: [PATCH v2 1/3] xfree86: allow fallback to PCI bus probe for graphics
|
|
devices on non-seat0 X servers (#66851)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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 <lbsousajr@gmail.com>
|
|
---
|
|
hw/xfree86/common/xf86Bus.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
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
|
|
--
|
|
1.8.4.5
|
|
|