[Intel-gfx] [PATCH v6 2/6] drm/i915/guc: Do not partition WOPCM if GuC is not used.

[Chris Wilson]

Quoting Jakub Bartmiński (2018-07-27 09:53:46)
> There seems to be no reason for doing extra work on WOPCM partitioning
> in the case GuC is not used, as the partitioning will not be used by the
> intel_wopcm_init_hw function anyway.
> 
> Signed-off-by: Jakub Bartmiński <jakub.bartminski at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Michał Winiarski <michal.winiarski at intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_wopcm.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
> index 74bf76f3fddc..09cc62b0d7ca 100644
> --- a/drivers/gpu/drm/i915/intel_wopcm.c
> +++ b/drivers/gpu/drm/i915/intel_wopcm.c
> @@ -163,6 +163,9 @@ int intel_wopcm_init(struct intel_wopcm *wopcm)
>         u32 guc_wopcm_rsvd;
>         int err;
>  
> +       if (!USES_GUC(dev_priv))
> +               return 0;
> +
>         GEM_BUG_ON(!wopcm->size);

My personal preference would be that wopcm->size = 0 if !USES_GUC, but
hey ho.

Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris