Skip to content

Commit

Permalink
drm/i915/selftests: Skip live timeline/suspend tests if wedged
Browse files Browse the repository at this point in the history
If the driver is wedged, we can not issue the requests to exercise the
timelines or the system across suspend, so skip the tests. live_hangcheck
is there to fail if we cannot recover.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190413125820.14112-4-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Apr 15, 2019
1 parent 5d75dc2 commit 1ab494c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/selftests/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,5 +215,8 @@ int i915_gem_live_selftests(struct drm_i915_private *i915)
SUBTEST(igt_gem_hibernate),
};

if (i915_terminally_wedged(i915))
return 0;

return i915_subtests(tests, i915);
}
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/selftests/i915_timeline.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,5 +838,8 @@ int i915_timeline_live_selftests(struct drm_i915_private *i915)
SUBTEST(live_hwsp_wrap),
};

if (i915_terminally_wedged(i915))
return 0;

return i915_subtests(tests, i915);
}

0 comments on commit 1ab494c

Please sign in to comment.