diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-07-19 18:33:27 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-07-19 18:34:55 +0100 |
commit | 250f0470009f600619be73d2e6bb890a2325041c (patch) | |
tree | da0195dede638cee5ba068d67838f5133373d661 /lib/drmtest.c | |
parent | 1c62e60d72469882e3a36820b23a45305cfdf492 (diff) |
lib: __drm_open_driver() needs to report the error
The __ prefixed functions are there to report the error and should not
automatically skip, which is handled by the normal unprefixed variant.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/drmtest.c')
-rw-r--r-- | lib/drmtest.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/drmtest.c b/lib/drmtest.c index a04540929..e76568004 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -272,7 +272,6 @@ int __drm_open_driver(int chipset) close(fd); } - igt_skip("No known gpu found\n"); return -1; } @@ -340,9 +339,10 @@ static void quiescent_gpu_at_exit_render(int sig) int drm_open_driver(int chipset) { static int open_count; - int fd = __drm_open_driver(chipset); + int fd; - igt_require(fd >= 0); + fd = __drm_open_driver(chipset); + igt_skip_on_f(fd<0, "No known gpu found\n"); if (__sync_fetch_and_add(&open_count, 1)) return fd; @@ -369,7 +369,6 @@ int drm_open_driver_master(int chipset) { int fd = drm_open_driver(chipset); - igt_require(fd >= 0); igt_require_f(drmSetMaster(fd) == 0, "Can't become DRM master, " "please check if no other DRM client is running.\n"); |