summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOscar Mateo <oscar.mateo@intel.com>2017-04-26 03:28:09 -0700
committerPetri Latvala <petri.latvala@intel.com>2017-05-04 11:32:22 +0300
commit03145b720728ed667770cf83baf46a60ae764dac (patch)
tree90a6e3cf7e5e3119328c67f2a74c7bff89fa013d
parentcbfdc33f772edf13dc55e98477512937af6bec53 (diff)
tests/pm_sseu: Re-enable the test
This test got inadvertently disabled by commit 83884e97 (Restore "lib: Open debugfs files for the given DRM device") when the initialization order got changed (dbg_init before gem_init). v2: - The asserts on fd are useless (Petri) - Deinit in inverse order. Cc: Petri Latvala <petri.latvala@intel.com> Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
-rw-r--r--tests/pm_sseu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/pm_sseu.c b/tests/pm_sseu.c
index 317bb261..7d4b33cf 100644
--- a/tests/pm_sseu.c
+++ b/tests/pm_sseu.c
@@ -187,6 +187,7 @@ dbg_get_status(struct status *stat)
static void
dbg_init(void)
{
+ igt_assert(gem.init);
dbg.status_fd = igt_debugfs_open(gem.drm_fd, "i915_sseu_status", O_RDONLY);
igt_skip_on_f(dbg.status_fd == -1,
"debugfs entry 'i915_sseu_status' not found\n");
@@ -354,8 +355,8 @@ full_enable(void)
static void
exit_handler(int sig)
{
- gem_deinit();
dbg_deinit();
+ gem_deinit();
}
igt_main
@@ -363,8 +364,8 @@ igt_main
igt_fixture {
igt_install_exit_handler(exit_handler);
- dbg_init();
gem_init();
+ dbg_init();
}
igt_subtest("full-enable")