diff options
| author | Chris Wilson | 2018-05-31 10:22:46 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-05-31 20:29:54 +0200 |
| commit | ec92ad00a393d07f7f6c1c9a0ff65141f2173050 (patch) | |
| tree | 3a9a2bf3918090d81d1ff577a2dde4006fcdca01 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915: After reset on sanitization, reset the engine backends (diff) | |
| download | kernel-qcow2-linux-ec92ad00a393d07f7f6c1c9a0ff65141f2173050.tar.gz kernel-qcow2-linux-ec92ad00a393d07f7f6c1c9a0ff65141f2173050.tar.xz kernel-qcow2-linux-ec92ad00a393d07f7f6c1c9a0ff65141f2173050.zip | |
drm/i915: Only sanitize GEM from late suspend
During testing we encounter a conflict between SUSPEND_TEST_DEVICES and
disabling reset (gem_eio/suspend). This results in the device continuing
on without being reset, but since it has gone through HW sanitization to
account for the suspend/resume cycle, we have to assume the device has
been reset to its defaults. A simple way around this is to skip the
sanitize phase for SUSPEND_TEST_DEVICES by moving it to suspend-late.
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/20180531082246.9763-4-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 32a65de7222d..38157df6ff5c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3169,6 +3169,7 @@ void i915_gem_cleanup_engines(struct drm_i915_private *dev_priv); int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv, unsigned int flags); int __must_check i915_gem_suspend(struct drm_i915_private *dev_priv); +void i915_gem_suspend_late(struct drm_i915_private *dev_priv); void i915_gem_resume(struct drm_i915_private *dev_priv); int i915_gem_fault(struct vm_fault *vmf); int i915_gem_object_wait(struct drm_i915_gem_object *obj, |