[PATCH 1/2] xfree86: Fallback to first platform device as primary

[Rob Clark]

On Wed, Jun 25, 2014 at 9:49 AM, Thierry Reding
<thierry.reding at gmail.com> wrote:
> From: Thierry Reding <treding at nvidia.com>
>
> When neither of the various bus implementations was able to find a
> primary bus and device, fallback to using the platform bus as primary
> bus and the first platform device as primary device.
>
> Signed-off-by: Thierry Reding <treding at nvidia.com>

Reviewed-by: Rob Clark <robdclark at gmail.com>
Tested-by: Rob Clark <robdclark at gmail.com>

> ---
>  hw/xfree86/common/xf86Bus.c         |  3 +++
>  hw/xfree86/common/xf86platformBus.c | 17 +++++++++++++++++
>  hw/xfree86/common/xf86platformBus.h |  1 +
>  3 files changed, 21 insertions(+)
>
> diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
> index b3b3f8cc524b..bd3e4e37bbb3 100644
> --- a/hw/xfree86/common/xf86Bus.c
> +++ b/hw/xfree86/common/xf86Bus.c
> @@ -210,6 +210,9 @@ xf86BusProbe(void)
>  #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
>      xf86SbusProbe();
>  #endif
> +#ifdef XSERVER_PLATFORM_BUS
> +    xf86platformPrimary();
> +#endif
>  }
>
>  /*
> diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
> index dd118a28565b..467b26b1de1a 100644
> --- a/hw/xfree86/common/xf86platformBus.c
> +++ b/hw/xfree86/common/xf86platformBus.c
> @@ -560,4 +560,21 @@ void xf86platformVTProbe(void)
>          xf86PlatformReprobeDevice(i, xf86_platform_devices[i].attribs);
>      }
>  }
> +
> +void xf86platformPrimary(void)
> +{
> +    /* use the first platform device as a fallback */
> +    if (primaryBus.type == BUS_NONE) {
> +        xf86Msg(X_INFO, "no primary bus or device found\n");
> +
> +        if (xf86_num_platform_devices > 0) {
> +            char *syspath = xf86_get_platform_attrib(0, ODEV_ATTRIB_SYSPATH);
> +
> +            xf86Msg(X_NONE, "\tfalling back to %s\n", syspath);
> +
> +            primaryBus.id.plat = &xf86_platform_devices[0];
> +            primaryBus.type = BUS_PLATFORM;
> +        }
> +    }
> +}
>  #endif
> diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h
> index 5dee4e0e029a..dec1956489fd 100644
> --- a/hw/xfree86/common/xf86platformBus.h
> +++ b/hw/xfree86/common/xf86platformBus.h
> @@ -77,6 +77,7 @@ extern _X_EXPORT int
>  xf86PlatformMatchDriver(char *matches[], int nmatches);
>
>  extern void xf86platformVTProbe(void);
> +extern void xf86platformPrimary(void);
>  #endif
>
>  #endif
> --
> 2.0.0
>