From: Chris Wilson Date: Tue, 14 Nov 2017 13:03:00 +0000 (+0000) Subject: drm/i915: Resume GuC before using GEM X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7469c62cb6549cf72bfd4d63cb3fc5f34eb0b2d0;p=openwrt%2Fstaging%2Fblogic.git drm/i915: Resume GuC before using GEM Resuming GEM presumes it can talk to hw, in particular to ensure the kernel context is loaded upon resume for powersaving. If the GuC is still asleep at this point, we upset the HW. Rearrange the resume such that we restore the original order of init-hw, resume-guc, use-gem. Fixes: 37cd33006d02 ("drm/i915: Remove redundant intel_autoenable_gt_powersave()") References: a1c419941453 ("drm/i915/guc: Add host2guc notification for suspend and resume") Signed-off-by: Chris Wilson Cc: Joonas Lahtinen Cc: Alex Dai Cc: Sagar Arun Kamble Cc: Michal Wajdeczko Link: https://patchwork.freedesktop.org/patch/msgid/20171114130300.25677-2-chris@chris-wilson.co.uk Reviewed-by: Sagar Arun Kamble --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 171b86f37878..1ae7031eedaa 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1708,8 +1708,6 @@ static int i915_drm_resume(struct drm_device *dev) i915_gem_resume(dev_priv); - intel_guc_resume(dev_priv); - intel_modeset_init_hw(dev); spin_lock_irq(&dev_priv->irq_lock); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a7979b74ce21..bf8fea792048 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4852,6 +4852,8 @@ void i915_gem_resume(struct drm_i915_private *i915) if (i915_gem_init_hw(i915)) goto err_wedged; + intel_guc_resume(i915); + /* Always reload a context for powersaving. */ if (i915_gem_switch_to_kernel_context(i915)) goto err_wedged;