[PATCH v2 1/3] xfree86: allow fallback to PCI bus probe for graphics devices on non-seat0 X servers (#66851)

[Hans de Goede]

Hi,

On 04/03/2014 04:19 PM, Laércio de Sousa wrote:
> 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 at gmail.com>

Looks good:

Reviewed by: Hans de Goede <hdegoede at redhat.com>

Regards,

Hans

> ---
>  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
>