[Intel-gfx] [RFC 13/14] drm/i915/guc: Move intel_guc_reserved_gtt_size to intel_wopcm_guc_size

[Michal Wajdeczko]

On Mon, 10 Jun 2019 17:54:18 +0200, Tvrtko Ursulin  
<tvrtko.ursulin at linux.intel.com> wrote:

> From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
>
> Reduces pointer chasing and gets more to the point.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Suggested-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>

Reviewed-by: Michal Wajdeczko <michal.wajdeczko at intel.com>

with small nit below

> ---
>  drivers/gpu/drm/i915/i915_gem_gtt.c |  2 +-
>  drivers/gpu/drm/i915/intel_guc.c    | 17 -----------------
>  drivers/gpu/drm/i915/intel_guc.h    |  1 -
>  drivers/gpu/drm/i915/intel_wopcm.h  | 17 +++++++++++++++++
>  4 files changed, 18 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c  
> b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 979305343ac3..e62041eb10b8 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -2853,7 +2853,7 @@ int i915_gem_init_ggtt(struct drm_i915_private  
> *dev_priv)
>  	 * why.
>  	 */
>  	ggtt->pin_bias = max_t(u32, I915_GTT_PAGE_SIZE,
> -			       intel_guc_reserved_gtt_size(&dev_priv->guc));
> +			       intel_wopcm_guc_size(&dev_priv->wopcm));
> 	ret = intel_vgt_balloon(ggtt);
>  	if (ret)
> diff --git a/drivers/gpu/drm/i915/intel_guc.c  
> b/drivers/gpu/drm/i915/intel_guc.c
> index 43232242d167..d45d97624402 100644
> --- a/drivers/gpu/drm/i915/intel_guc.c
> +++ b/drivers/gpu/drm/i915/intel_guc.c
> @@ -686,23 +686,6 @@ struct i915_vma *intel_guc_allocate_vma(struct  
> intel_guc *guc, u32 size)
>  	return vma;
>  }
> -/**
> - * intel_guc_reserved_gtt_size()
> - * @guc:	intel_guc structure
> - *
> - * The GuC WOPCM mapping shadows the lower part of the GGTT, so if we  
> are using
> - * GuC we can't have any objects pinned in that region. This function  
> returns
> - * the size of the shadowed region.
> - *
> - * Returns:
> - * 0 if GuC is not present or not in use.
> - * Otherwise, the GuC WOPCM size.
> - */
> -u32 intel_guc_reserved_gtt_size(struct intel_guc *guc)
> -{
> -	return guc_to_i915(guc)->wopcm.guc.size;
> -}
> -
>  int intel_guc_reserve_ggtt_top(struct intel_guc *guc)
>  {
>  	struct drm_i915_private *i915 = guc_to_i915(guc);
> diff --git a/drivers/gpu/drm/i915/intel_guc.h  
> b/drivers/gpu/drm/i915/intel_guc.h
> index e07e4c69cf08..85c3b02a0c08 100644
> --- a/drivers/gpu/drm/i915/intel_guc.h
> +++ b/drivers/gpu/drm/i915/intel_guc.h
> @@ -172,7 +172,6 @@ int intel_guc_auth_huc(struct intel_guc *guc, u32  
> rsa_offset);
>  int intel_guc_suspend(struct intel_guc *guc);
>  int intel_guc_resume(struct intel_guc *guc);
>  struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32  
> size);
> -u32 intel_guc_reserved_gtt_size(struct intel_guc *guc);
>  int intel_guc_reserve_ggtt_top(struct intel_guc *guc);
>  void intel_guc_release_ggtt_top(struct intel_guc *guc);
> diff --git a/drivers/gpu/drm/i915/intel_wopcm.h  
> b/drivers/gpu/drm/i915/intel_wopcm.h
> index 6298910a384c..1c32d449fc10 100644
> --- a/drivers/gpu/drm/i915/intel_wopcm.h
> +++ b/drivers/gpu/drm/i915/intel_wopcm.h
> @@ -24,6 +24,23 @@ struct intel_wopcm {
>  	} guc;
>  };
> +/**
> + * intel_wopcm_guc_size()
> + * @wopcm:	intel_wopcm structure
> + *
> + * The GuC WOPCM mapping shadows the lower part of the GGTT, so if we  
> are using
> + * GuC we can't have any objects pinned in that region.

maybe we can drop above sentence is we already have something similar
as comment in i915_gem_init_ggtt ? pin/GGTT doesn't fit here.

> This function returns
> + * the size of the shadowed region.
> + *
> + * Returns:
> + * 0 if GuC is not present or not in use.
> + * Otherwise, the GuC WOPCM size.
> + */
> +static inline u32 intel_wopcm_guc_size(struct intel_wopcm *wopcm)
> +{
> +    return wopcm->guc.size;
> +}
> +
>  void intel_wopcm_init_early(struct intel_wopcm *wopcm);
>  int intel_wopcm_init(struct intel_wopcm *wopcm);
>  int intel_wopcm_init_hw(struct intel_wopcm *wopcm);