[PATCH 2/5] drm/i915/uc: Disable GuC communication only if currently enabled

Fernando Pacheco fernando.pacheco at intel.com
Mon Aug 26 20:58:13 UTC 2019


We continue to load the driver after GuC initialization
failures which means we will end up attempting to clean up
communication that was never enabled.

Signed-off-by: Fernando Pacheco <fernando.pacheco at intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 78cd9eae5f7f..a45641e1b627 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -536,7 +536,9 @@ void intel_uc_fini_hw(struct intel_uc *uc)
 	if (intel_uc_supports_guc_submission(uc))
 		intel_guc_submission_disable(guc);
 
-	guc_disable_communication(guc);
+	if (guc_communication_enabled(guc))
+		guc_disable_communication(guc);
+
 	__uc_sanitize(uc);
 }
 
-- 
2.23.0



More information about the Intel-gfx-trybot mailing list