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

Commit b9d52d38 authored by Sujaritha Sundaresan's avatar Sujaritha Sundaresan Committed by Chris Wilson
Browse files

drm/i915/guc: GuC suspend path cleanup 



Adding a call to intel_uc_suspend in i915_gem_suspend, which
is a common point for the suspend/resume and hibernate paths.
This fixes an unbalanced call that causes issues with the CTB
register/deregister.

v2: Making the call unconditional (Daniele)
	Moving the call to after the GEM_BUG_ON (Chris)

Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarSujaritha Sundaresan <sujaritha.sundaresan@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/20190321203804.6845-1-sujaritha.sundaresan@intel.com
parent e70d3d80

drivers/gpu/drm/i915/i915_gem.c

+2 −0
Original line number Diff line number Diff line
@@ -4431,6 +4431,8 @@ void i915_gem_suspend(struct drm_i915_private *i915) 
	 */

	GEM_BUG_ON(i915->gt.awake);



	intel_uc_suspend(i915);



	intel_runtime_pm_put(i915, wakeref);

}