[Intel-gfx] [PATCH i-g-t] lib/drmtest: Take DRIVER_ANY into account when opening the DRM device

[Chris Wilson]

On Thu, Oct 27, 2016 at 09:58:19AM +0200, Tomeu Vizoso wrote:
> __drm_open_driver was changed to bail out on VGEM devices unless they
> are explicitly asked for (DRIVER_VGEM). But with that change we lost
> support for DRIVER_ANY.
> 
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
> Fixes: 7ce63894854d ("lib: Support opening vGEM device")
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  lib/drmtest.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/lib/drmtest.c b/lib/drmtest.c
> index 5d3aaa836735..786ffa1b1fae 100644
> --- a/lib/drmtest.c
> +++ b/lib/drmtest.c
> @@ -269,6 +269,10 @@ int __drm_open_driver(int chipset)
>  		    is_virtio_device(fd))
>  			return fd;
>  
> +		/* Only VGEM-specific tests should be run on VGEM */
> +		if (chipset & DRIVER_ANY && !is_vgem_device(fd))
> +			return fd;
> +

chipset == DRIVER_ANY

Otherwise if we request DRIVER_INTEL, this will return the first hit if
!intel and !vgem.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre