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

Commit 1ed21cb4 authored by Sagar Arun Kamble's avatar Sagar Arun Kamble Committed by Chris Wilson
Browse files

drm/i915/guc: Enable interrupts before resuming GuC during runtime resume 

GuC log streaming needs interrupts enabled prior to GuC resume but
runtime pm interrupt setup was happening post GuC resume. Fix it.
While at it, fix the unwinding of steps in the runtime suspend path.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104695


Signed-off-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Marta Lofstedt <marta.lofstedt@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/1516808821-3638-2-git-send-email-sagar.a.kamble@intel.com
parent 1be333d3

drivers/gpu/drm/i915/i915_drv.c

+9 −4
Original line number Diff line number Diff line
@@ -2600,6 +2600,11 @@ static int intel_runtime_suspend(struct device *kdev) 


		intel_runtime_pm_enable_interrupts(dev_priv);



		intel_guc_resume(dev_priv);



		i915_gem_init_swizzling(dev_priv);

		i915_gem_restore_fences(dev_priv);



		enable_rpm_wakeref_asserts(dev_priv);



		return ret;
@@ -2665,8 +2670,6 @@ static int intel_runtime_resume(struct device *kdev) 
	if (intel_uncore_unclaimed_mmio(dev_priv))

		DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");



	intel_guc_resume(dev_priv);



	if (IS_GEN9_LP(dev_priv)) {

		bxt_disable_dc9(dev_priv);

		bxt_display_core_init(dev_priv, true);
@@ -2681,6 +2684,10 @@ static int intel_runtime_resume(struct device *kdev) 


	intel_uncore_runtime_resume(dev_priv);



	intel_runtime_pm_enable_interrupts(dev_priv);



	intel_guc_resume(dev_priv);



	/*

	 * No point of rolling back things in case of an error, as the best

	 * we can do is to hope that things will still work (and disable RPM).
@@ -2688,8 +2695,6 @@ static int intel_runtime_resume(struct device *kdev) 
	i915_gem_init_swizzling(dev_priv);

	i915_gem_restore_fences(dev_priv);



	intel_runtime_pm_enable_interrupts(dev_priv);



	/*

	 * On VLV/CHV display interrupts are part of the display

	 * power well, so hpd is reinitialized from there. For