[3/3] drm/i915/uc: Fini hw even if GuC is not running
diff mbox series

Message ID 20190828004558.11903-4-fernando.pacheco@intel.com
State New
Headers show
  • Add/modify checks within intel_uc_fini_hw
Related show

Commit Message

Fernando Pacheco Aug. 28, 2019, 12:45 a.m. UTC
We should not be skipping uc_fini_hw on finding GuC
is no longer running. There is plenty of hw and internal
state that can be cleaned up without having to communicate
with GuC.

v2: better to check if fw is available (Michal)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110943
Signed-off-by: Fernando Pacheco <fernando.pacheco@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
 drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index b2eb340ce87e..ad5b928fe36a 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -535,7 +535,7 @@  void intel_uc_fini_hw(struct intel_uc *uc)
 	struct intel_guc *guc = &uc->guc;
-	if (!intel_guc_is_running(guc))
+	if (!intel_uc_fw_is_available(&guc->fw))
 	if (intel_guc_is_submission_enabled(guc))