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@xxxxxxxxx> Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx> Cc: Michał Winiarski <michal.winiarski@xxxxxxxxx> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> --- 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) guc_free_load_err_log(guc); - if (!i915_modparams.enable_guc_loading) - return; - i915_guc_submission_disable(dev_priv); guc_disable_communication(guc); @@ -283,5 +280,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv) gen9_disable_guc_interrupts(dev_priv); i915_guc_submission_fini(dev_priv); - i915_ggtt_disable_guc(dev_priv); + if (i915_modparams.enable_guc_loading) + i915_ggtt_disable_guc(dev_priv); } -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
