drm/i915: Move GEM sanitize from resume_early to resume
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 14 Jun 2018 09:40:59 +0000 (10:40 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 14 Jun 2018 12:06:23 +0000 (13:06 +0100)
commit1288786b18f7d979f1f9bcb0134ee5fbfcc8e3d1
tree87b4260c1a98ade5b1c9cb720afd8a5d5191d9d7
parent2e932b9cdecebe3f41eaa86f8cec15c42fc62d41
drm/i915: Move GEM sanitize from resume_early to resume

This should be a no-op in terms of our control flow, we move the
sanitization (GPU reset) from the bottom of the early resume phase to
the top of the next. However, following hibernation debug, the power
code skips the early resume phase, but as we are about to completely
restore the GTT mappings, we first need to stop the GPU using them i.e.
perform a GPU reset (i915_gem_sanitize()).

Testcase: igt/gem_exec_suspend/basic-S4-devices
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180614094103.18025-1-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/i915_drv.c