[Intel-gfx] [PATCH igt] igt/pm_sseu: Mark requirements with igt_require

Chris Wilson chris at chris-wilson.co.uk
Thu Nov 30 21:36:40 UTC 2017


Not all platforms have a readily defined media routines, so don't assert
but require they exist.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104003
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 tests/pm_sseu.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/pm_sseu.c b/tests/pm_sseu.c
index 7d4b33cf..2a2f06bb 100644
--- a/tests/pm_sseu.c
+++ b/tests/pm_sseu.c
@@ -253,12 +253,17 @@ static void
 gem_init(void)
 {
 	gem.drm_fd = drm_open_driver(DRIVER_INTEL);
+	igt_require_gem(gem.drm_fd);
 	gem.init = 1;
 
 	gem.devid = intel_get_drm_devid(gem.drm_fd);
 	gem.gen = intel_gen(gem.devid);
 	igt_require_f(gem.gen >= 8,
 		      "SSEU power gating only relevant for Gen8+");
+
+	gem.spinfunc = igt_get_media_spinfunc(gem.devid);
+	igt_require(gem.spinfunc);
+
 	gem.has_ppgtt = gem_uses_ppgtt(gem.drm_fd);
 
 	gem.bufmgr = drm_intel_bufmgr_gem_init(gem.drm_fd, 4096);
@@ -271,9 +276,6 @@ gem_init(void)
 	igt_assert(gem.batch);
 	gem.init = 3;
 
-	gem.spinfunc = igt_get_media_spinfunc(gem.devid);
-	igt_assert(gem.spinfunc);
-
 	gem.buf.stride = sizeof(uint32_t);
 	gem.buf.tiling = I915_TILING_NONE;
 	gem.buf.size = gem.buf.stride;
-- 
2.15.1



More information about the Intel-gfx mailing list