From 9921aff583acfcde3b79c133faa0644804d67ebc Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Mon, 17 Oct 2016 10:05:20 +0200 Subject: lib/drmtest: Take DRIVER_ANY into account when opening the DRM device __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 Fixes: 7ce63894854d ("lib: Support opening vGEM device") Cc: Chris Wilson --- lib/drmtest.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/drmtest.c') diff --git a/lib/drmtest.c b/lib/drmtest.c index 5d3aaa83..786ffa1b 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; + close(fd); } -- cgit v1.2.3