frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <lbsousajr@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Laércio de Sousa 2014-04-03 11:19:13 -03:00 committed by Peter Hutterer
parent e06fbe4dc8
commit 29b1484bb9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86Bus.c
View File

@ -81,7 +81,7 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
if (drv->platformProbe != NULL) { if (drv->platformProbe != NULL) {
foundScreen = xf86platformProbeDev(drv); foundScreen = xf86platformProbeDev(drv);
} }
if (ServerIsNotSeat0()) if (ServerIsNotSeat0() && foundScreen)
return foundScreen; return foundScreen;
#endif #endif
@ -201,7 +201,7 @@ xf86BusProbe(void)
{ {
#ifdef XSERVER_PLATFORM_BUS #ifdef XSERVER_PLATFORM_BUS
xf86platformProbe(); xf86platformProbe();
if (ServerIsNotSeat0()) if (ServerIsNotSeat0() && xf86_num_platform_devices > 0)
return; return;
#endif #endif
#ifdef XSERVER_LIBPCIACCESS #ifdef XSERVER_LIBPCIACCESS