summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2018-04-05 19:41:32 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2018-04-06 16:52:24 +0100
commita86714b95838dd20a091b04f8c4139d0acf7f16b (patch)
tree506bef011e9362b308e35c2c75d3cd1f1d9a7cd0
parent5e304cb3a687fc9ded946b20c5b0a7467e26d599 (diff)
igt/gem_eio: Drop DRM_MASTER so we can reacquire it in the subtests
As we reopen the fd for each subtest, and we need a DRM_MASTER, we need to drop master on the original before we are allowed to claim DRM_MASTER on the second. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105922 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
-rw-r--r--tests/gem_eio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/gem_eio.c b/tests/gem_eio.c
index 1a4659a9..6455c6ac 100644
--- a/tests/gem_eio.c
+++ b/tests/gem_eio.c
@@ -41,6 +41,7 @@
#include <drm.h>
#include "igt.h"
+#include "igt_device.h"
#include "igt_sysfs.h"
#include "sw_sync.h"
@@ -674,6 +675,7 @@ igt_main
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
+ igt_device_drop_master(fd);
igt_require(i915_reset_control(true));
igt_force_gpu_reset(fd);