[Intel-gfx] [PATCH 5/7] drm/i915: Introduce gt_init_mmio

[Tvrtko Ursulin]

On 26/06/2020 00:42, Daniele Ceraolo Spurio wrote:
> We already call 2 gt-related init_mmio functions in driver_mmio_probe
> and a 3rd one will be added by a follow-up patch, so pre-emptively
> introduce a gt_init_mmio function to group them.
> 
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com>
> Cc: Andi Shyti <andi.shyti at intel.com>
> ---
>   drivers/gpu/drm/i915/gt/intel_gt.c | 7 +++++++
>   drivers/gpu/drm/i915/gt/intel_gt.h | 1 +
>   drivers/gpu/drm/i915/i915_drv.c    | 4 +---
>   3 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
> index d0ae1cb5c7c9..949114f09b82 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt.c
> @@ -44,6 +44,13 @@ void intel_gt_init_hw_early(struct intel_gt *gt, struct i915_ggtt *ggtt)
>   	gt->ggtt = ggtt;
>   }
>   
> +int intel_gt_init_mmio(struct intel_gt *gt)
> +{
> +	intel_uc_init_mmio(&gt->uc);
> +
> +	return intel_engines_init_mmio(gt);
> +}
> +
>   static void init_unused_ring(struct intel_gt *gt, u32 base)
>   {
>   	struct intel_uncore *uncore = gt->uncore;
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h
> index 15142e2a3b22..4bd64ab2b686 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt.h
> +++ b/drivers/gpu/drm/i915/gt/intel_gt.h
> @@ -36,6 +36,7 @@ static inline struct intel_gt *huc_to_gt(struct intel_huc *huc)
>   
>   void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915);
>   void intel_gt_init_hw_early(struct intel_gt *gt, struct i915_ggtt *ggtt);
> +int intel_gt_init_mmio(struct intel_gt *gt);
>   int __must_check intel_gt_init_hw(struct intel_gt *gt);
>   int intel_gt_init(struct intel_gt *gt);
>   void intel_gt_driver_register(struct intel_gt *gt);
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 67789df42be8..5fd5af4bc855 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -531,9 +531,7 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv)
>   	/* Try to make sure MCHBAR is enabled before poking at it */
>   	intel_setup_mchbar(dev_priv);
>   
> -	intel_uc_init_mmio(&dev_priv->gt.uc);
> -
> -	ret = intel_engines_init_mmio(&dev_priv->gt);
> +	ret = intel_gt_init_mmio(&dev_priv->gt);
>   	if (ret)
>   		goto err_uncore;
>   
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko