summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2017-11-30 21:31:30 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2017-12-08 12:52:08 +0000
commit39ac6b89e9e51b55886181aabd91739ea1e61adb (patch)
tree12b33e79d5cd249c3efc92086df1c83f8a62b508
parente5ca5dc03090280e05c628dbc16af2f6c94d8f92 (diff)
igt/pm_sseu: Mark requirements with igt_require
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@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
-rw-r--r--tests/pm_sseu.c8
1 files 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;