[Intel-gfx] [PATCH v10 9/9] drm/i915/guc: Fix GuC cleanup in unload path

Chris Wilson chris at chris-wilson.co.uk
Thu Sep 28 11:55:39 UTC 2017


Quoting Sagar Arun Kamble (2017-09-27 10:30:39)
> -void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
> +void intel_uc_cleanup(struct drm_i915_private *dev_priv)
>  {
>         guc_free_load_err_log(&dev_priv->guc);
>  
>         if (!i915_modparams.enable_guc_loading)
>                 return;
>  
> -       guc_disable_communication(&dev_priv->guc);
> -
> -       if (i915_modparams.enable_guc_submission) {
> -               gen9_disable_guc_interrupts(dev_priv);
> -               i915_guc_submission_fini(dev_priv);
> -       }
> -
> -       i915_ggtt_disable_guc(dev_priv);
> +       if (i915_modparams.enable_guc_submission)
> +               i915_guc_submission_cleanup(dev_priv);

My preference would be for if (!guc->stage_desc_pool) return; inside
i915_guc_submission_cleanup().
-Chris


More information about the Intel-gfx mailing list