[Intel-gfx] [PATCH i-g-t 3/3] tests/drv_hangman: Open drm fd before doing anything

Daniel Vetter daniel.vetter at ffwll.ch
Wed Dec 2 22:45:36 PST 2015


This way we correctly auto-skip instead of falling over the
lack of i915 debugfs files first and fail the testcase due to
that.

Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 tests/drv_hangman.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/drv_hangman.c b/tests/drv_hangman.c
index 6caf910b0b12..cd63b97db370 100644
--- a/tests/drv_hangman.c
+++ b/tests/drv_hangman.c
@@ -217,10 +217,11 @@ static void test_error_state_basic(void)
 {
 	int fd;
 
+	fd = drm_open_driver(DRIVER_INTEL);
+
 	clear_error_state();
 	assert_error_state_clear();
 
-	fd = drm_open_driver(DRIVER_INTEL);
 	submit_batch(fd, I915_EXEC_RENDER, true);
 	close(fd);
 
@@ -373,9 +374,10 @@ static void test_error_state_capture(unsigned ring_id,
 	uint64_t offset;
 	bool cmd_parser;
 
+	fd = drm_open_driver(DRIVER_INTEL);
+
 	clear_error_state();
 
-	fd = drm_open_driver(DRIVER_INTEL);
 	gen = intel_gen(intel_get_drm_devid(fd));
 	cmd_parser = uses_cmd_parser(fd, gen);
 
-- 
2.5.1



More information about the Intel-gfx mailing list