[PATCH 09/21] drm/i915/guc: Update enable_guc_loading check in intel_uc_fini_hw

Sagar Arun Kamble sagar.a.kamble at intel.com
Thu Oct 12 04:30:02 UTC 2017

With most of the GuC related disabling/cleanup now separated from GuC
parameters, only function that needs GuC parameter enable_guc_loading
check is i915_disable_guc_ggtt as that is enabled based it. So call only
i915_disable_guc_ggtt when enable_guc_loading is set during uc_fini_hw.

Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: MichaƂ Winiarski <michal.winiarski at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
 drivers/gpu/drm/i915/intel_uc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 974434e..7305486 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -273,9 +273,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
-	if (!i915_modparams.enable_guc_loading)
-		return;
@@ -283,5 +280,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
-	i915_ggtt_disable_guc(dev_priv);
+	if (i915_modparams.enable_guc_loading)
+		i915_ggtt_disable_guc(dev_priv);

More information about the Intel-gfx-trybot mailing list