[Intel-gfx] [PATCH] drm/i915/plane: add intel_plane_helper_add() helper

[Ville Syrjälä]

On Tue, May 18, 2021 at 04:24:26PM +0300, Jani Nikula wrote:
> Add a small helper to keep intel_plane_helper_funcs static.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/display/i9xx_plane.c          | 2 +-
>  drivers/gpu/drm/i915/display/intel_atomic_plane.c  | 7 ++++++-
>  drivers/gpu/drm/i915/display/intel_atomic_plane.h  | 3 +--
>  drivers/gpu/drm/i915/display/intel_cursor.c        | 2 +-
>  drivers/gpu/drm/i915/display/intel_sprite.c        | 2 +-
>  drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +-
>  6 files changed, 11 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
> index 9643c45a2209..b1439ba78f67 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_plane.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
> @@ -912,7 +912,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
>  	zpos = 0;
>  	drm_plane_create_zpos_immutable_property(&plane->base, zpos);
>  
> -	drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);
> +	intel_plane_helper_add(plane);
>  
>  	return plane;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> index 36f52a1d7552..47234d898549 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> @@ -601,7 +601,12 @@ int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
>  	return 0;
>  }
>  
> -const struct drm_plane_helper_funcs intel_plane_helper_funcs = {
> +static const struct drm_plane_helper_funcs intel_plane_helper_funcs = {
>  	.prepare_fb = intel_prepare_plane_fb,
>  	.cleanup_fb = intel_cleanup_plane_fb,
>  };
> +
> +void intel_plane_helper_add(struct intel_plane *plane)
> +{
> +	drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> index dc4d05e75e1c..62e5a2a77fd4 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> @@ -17,8 +17,6 @@ struct intel_crtc_state;
>  struct intel_plane;
>  struct intel_plane_state;
>  
> -extern const struct drm_plane_helper_funcs intel_plane_helper_funcs;
> -
>  unsigned int intel_adjusted_rate(const struct drm_rect *src,
>  				 const struct drm_rect *dst,
>  				 unsigned int rate);
> @@ -65,5 +63,6 @@ int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
>  				      bool can_position);
>  void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,
>  			       struct intel_plane_state *plane_state);
> +void intel_plane_helper_add(struct intel_plane *plane);
>  
>  #endif /* __INTEL_ATOMIC_PLANE_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
> index 2ab389b38694..08fa844e1342 100644
> --- a/drivers/gpu/drm/i915/display/intel_cursor.c
> +++ b/drivers/gpu/drm/i915/display/intel_cursor.c
> @@ -797,7 +797,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,
>  	if (DISPLAY_VER(dev_priv) >= 12)
>  		drm_plane_enable_fb_damage_clips(&cursor->base);
>  
> -	drm_plane_helper_add(&cursor->base, &intel_plane_helper_funcs);
> +	intel_plane_helper_add(cursor);
>  
>  	return cursor;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
> index 4ae9a7455b23..08116f41da26 100644
> --- a/drivers/gpu/drm/i915/display/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/display/intel_sprite.c
> @@ -1856,7 +1856,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
>  	zpos = sprite + 1;
>  	drm_plane_create_zpos_immutable_property(&plane->base, zpos);
>  
> -	drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);
> +	intel_plane_helper_add(plane);
>  
>  	return plane;
>  
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 59e032f3687a..e9ad050c8a06 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -2152,7 +2152,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
>  						BIT(DRM_SCALING_FILTER_DEFAULT) |
>  						BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
>  
> -	drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);
> +	intel_plane_helper_add(plane);
>  
>  	return plane;
>  
> -- 
> 2.20.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel