[Intel-gfx] [PATCH v7 2/4] drm/i915/guc : Removing i915_modparams.enable_guc_loading module parameter

[Chris Wilson]

Quoting Sujaritha Sundaresan (2017-10-17 23:50:47)
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index dd141b2..5b9bdd0 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3201,9 +3201,12 @@ static inline unsigned int i915_sg_segment_size(void)
>   */
>  #define HAS_GUC(dev_priv)      ((dev_priv)->info.has_guc)
>  #define HAS_GUC_CT(dev_priv)   ((dev_priv)->info.has_guc_ct)
> -#define HAS_GUC_UCODE(dev_priv)        (HAS_GUC(dev_priv))
> -#define HAS_GUC_SCHED(dev_priv)        (HAS_GUC(dev_priv))
> -#define HAS_HUC_UCODE(dev_priv)        (HAS_GUC(dev_priv))
> +#define HAS_GUC_UCODE(dev_priv) ((dev_priv)->guc.fw.path != NULL)
> +#define HAS_HUC_UCODE(dev_priv) ((dev_priv)->huc.fw.path != NULL)
> +
> +#define NEEDS_GUC_LOADING(dev_priv) \
> +       (HAS_GUC(dev_priv) && \
> +       (i915_modparams.enable_guc_submission || HAS_HUC_UCODE(dev_priv)))

NEEDS_GUC_FW ?
-Chris