Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1288786b authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarChris 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: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 2e932b9c

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1698,6 +1698,8 @@ static int i915_drm_resume(struct drm_device *dev) 
	disable_rpm_wakeref_asserts(dev_priv);

	intel_sanitize_gt_powersave(dev_priv);



	i915_gem_sanitize(dev_priv);



	ret = i915_ggtt_enable_hw(dev_priv);

	if (ret)

		DRM_ERROR("failed to re-enable GGTT\n");
@@ -1839,8 +1841,6 @@ static int i915_drm_resume_early(struct drm_device *dev) 
	else

		intel_display_set_init_power(dev_priv, true);



	i915_gem_sanitize(dev_priv);



	enable_rpm_wakeref_asserts(dev_priv);



out: