diff options
| author | Sujaritha Sundaresan <[email protected]> | 2019-03-21 13:38:04 -0700 |
|---|---|---|
| committer | Chris Wilson <[email protected]> | 2019-03-22 08:58:07 +0000 |
| commit | b9d52d381e142fb3275430ac40ab119565d046f4 (patch) | |
| tree | b218ee29b8d838012b64fcc2b6e6cddf608fcd3e | |
| parent | e70d3d8040410a46893c0986a5b0fd64c466b7e9 (diff) | |
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 <[email protected]>
Cc: Chris Wilson <[email protected]>
Cc: Michal Wajdeczko <[email protected]>
Signed-off-by: Sujaritha Sundaresan <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>
Signed-off-by: Chris Wilson <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 638ae277ff03..4685ed04b354 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -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); } |