OSDN Git Service

drm/i915/uc: Extract common code from GuC stop/disable comm
authorFernando Pacheco <fernando.pacheco@intel.com>
Thu, 29 Aug 2019 17:41:53 +0000 (10:41 -0700)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 29 Aug 2019 18:46:40 +0000 (19:46 +0100)
commit9be02fde93e5b564663f10a48f19159fba718e3d
tree1590e82d8117b10610e084cee3ebd78daa47245b
parente7b6affd0baef7b3c5e2acd94236093dcf437105
drm/i915/uc: Extract common code from GuC stop/disable comm

During normal driver unload we attempt to disable GuC communication
while it is currently stopped. This results in a nop'd call to
intel_guc_ct_disable within guc_disable_communication because
stop/disable rely on the same flag to prevent further comms with CT.

We can avoid the call to disable and still leave communication in a
satisfactory state by extracting a set of shared steps from stop/disable.
This set can include guc_disable_interrupts as we do not require the
single caller of guc_stop_communication to be atomic:
"drm/i915/selftests: Fixup atomic reset checking".

This situation (stop -> disable) only occurs during intel_uc_fini_hw,
so during fini, call guc_disable_communication only if currently enabled.
The symmetric calls to enable/disable remain unmodified for all other
scenarios.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110943
Signed-off-by: Fernando Pacheco <fernando.pacheco@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190829174154.14675-1-fernando.pacheco@intel.com
drivers/gpu/drm/i915/gt/uc/intel_uc.c