OSDN Git Service

drm/i915/uc: Don't enable communication twice on resume
authorDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Tue, 30 Jul 2019 23:07:39 +0000 (16:07 -0700)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 31 Jul 2019 09:01:32 +0000 (10:01 +0100)
commit602776f96bfa50a6107af017522501c43a82b29a
tree8bdc31f10a0bb3a8103424dbab8a61662746caaa
parentf277bc0c98a407732d933ac5c53d9cd1224653cb
drm/i915/uc: Don't enable communication twice on resume

When coming out of S3/S4 we sanitize and re-init the HW, which includes
enabling communication during uc_init_hw. We therefore don't want to do
that again in uc_resume and can just tell GuC to reload its state.

v2: split uc_resume and uc_runtime_resume to match the suspend
    functions and to better differentiate the expected state in the 2
    scenarios (Chris)

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190730230743.19542-1-daniele.ceraolospurio@intel.com
drivers/gpu/drm/i915/gt/uc/intel_uc.c
drivers/gpu/drm/i915/gt/uc/intel_uc.h
drivers/gpu/drm/i915/i915_drv.c