diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-07-06 07:53:13 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-07-06 11:25:16 +0100 |
| commit | 921d07d73ebf6d87064883d69fedd3d7e9e99538 (patch) | |
| tree | 21d82e0250148f361561bc1aae6362601ad5413c /drivers/gpu | |
| parent | 7783decff5be6811a1a31df91b47fd2541b993d0 (diff) | |
| download | blackbird-obmc-linux-921d07d73ebf6d87064883d69fedd3d7e9e99538.tar.gz blackbird-obmc-linux-921d07d73ebf6d87064883d69fedd3d7e9e99538.zip | |
drm/i915/selftests: Skip huge pages live tests if wedged
We test the GPU handling of huge pages by submitting requests that write
into a huge page, but if the GPU is irrecoverably wedged we cannot
submit any requests. As the test expectedly fails, skip over it.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706065332.15214-8-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/huge_pages.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/selftests/huge_pages.c b/drivers/gpu/drm/i915/selftests/huge_pages.c index 39699939587d..1193dd36913a 100644 --- a/drivers/gpu/drm/i915/selftests/huge_pages.c +++ b/drivers/gpu/drm/i915/selftests/huge_pages.c @@ -1748,6 +1748,9 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *dev_priv) return 0; } + if (i915_terminally_wedged(&dev_priv->gpu_error)) + return 0; + file = mock_file(dev_priv); if (IS_ERR(file)) return PTR_ERR(file); |
