OSDN Git Service

drm/i915: Resume GuC before using GEM
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 14 Nov 2017 13:03:00 +0000 (13:03 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 14 Nov 2017 23:50:48 +0000 (23:50 +0000)
commit7469c62cb6549cf72bfd4d63cb3fc5f34eb0b2d0
tree68f5959e651157ad0521d0342495cdfed1332eb9
parentdf49ec8223050d510bd243d85c51139fc101029f
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 <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Alex Dai <yu.dai@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171114130300.25677-2-chris@chris-wilson.co.uk
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem.c