drm/i915: Only sanitize GEM from late suspend
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 31 May 2018 08:22:46 +0000 (09:22 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 31 May 2018 18:29:54 +0000 (19:29 +0100)
commitec92ad00a393d07f7f6c1c9a0ff65141f2173050
tree3a9a2bf3918090d81d1ff577a2dde4006fcdca01
parentc3160da9a6af0e2d8f4fb3410df9d027a178ca3d
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
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c