[Intel-gfx] [PATCH 1/2] drm/i915: Don't pass plane to .check_plane()

[Souza, Jose]

On Tue, 2018-08-28 at 17:27 +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> .check_plane() already gets the plane state, so we can dig out the
> plane
> from there if needed. No need in passing it separately.
> 

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> Cc: José Roberto de Souza <jose.souza at intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_atomic_plane.c |  2 +-
>  drivers/gpu/drm/i915/intel_display.c      | 11 +++++------
>  drivers/gpu/drm/i915/intel_drv.h          |  5 ++---
>  drivers/gpu/drm/i915/intel_sprite.c       |  4 ++--
>  4 files changed, 10 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c
> b/drivers/gpu/drm/i915/intel_atomic_plane.c
> index dcba645cabb8..eddcdd6e4b3b 100644
> --- a/drivers/gpu/drm/i915/intel_atomic_plane.c
> +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
> @@ -159,7 +159,7 @@ int intel_plane_atomic_check_with_state(const
> struct intel_crtc_state *old_crtc_
>  	}
>  
>  	intel_state->base.visible = false;
> -	ret = intel_plane->check_plane(intel_plane, crtc_state,
> intel_state);
> +	ret = intel_plane->check_plane(crtc_state, intel_state);
>  	if (ret)
>  		return ret;
>  
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 30fdfd1a3037..28146a132774 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9694,8 +9694,7 @@ static bool i845_cursor_size_ok(const struct
> intel_plane_state *plane_state)
>  	return intel_cursor_size_ok(plane_state) && IS_ALIGNED(width,
> 64);
>  }
>  
> -static int i845_check_cursor(struct intel_plane *plane,
> -			     struct intel_crtc_state *crtc_state,
> +static int i845_check_cursor(struct intel_crtc_state *crtc_state,
>  			     struct intel_plane_state *plane_state)
>  {
>  	const struct drm_framebuffer *fb = plane_state->base.fb;
> @@ -9885,10 +9884,10 @@ static bool i9xx_cursor_size_ok(const struct
> intel_plane_state *plane_state)
>  	return true;
>  }
>  
> -static int i9xx_check_cursor(struct intel_plane *plane,
> -			     struct intel_crtc_state *crtc_state,
> +static int i9xx_check_cursor(struct intel_crtc_state *crtc_state,
>  			     struct intel_plane_state *plane_state)
>  {
> +	struct intel_plane *plane = to_intel_plane(plane_state-
> >base.plane);
>  	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
>  	const struct drm_framebuffer *fb = plane_state->base.fb;
>  	enum pipe pipe = plane->pipe;
> @@ -13192,10 +13191,10 @@ skl_max_scale(struct intel_crtc
> *intel_crtc,
>  }
>  
>  static int
> -intel_check_primary_plane(struct intel_plane *plane,
> -			  struct intel_crtc_state *crtc_state,
> +intel_check_primary_plane(struct intel_crtc_state *crtc_state,
>  			  struct intel_plane_state *state)
>  {
> +	struct intel_plane *plane = to_intel_plane(state->base.plane);
>  	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
>  	struct drm_crtc *crtc = state->base.crtc;
>  	int min_scale = DRM_PLANE_HELPER_NO_SCALING;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index ea758aa4dee3..3c7f0517c1bc 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -972,9 +972,8 @@ struct intel_plane {
>  	void (*disable_plane)(struct intel_plane *plane,
>  			      struct intel_crtc *crtc);
>  	bool (*get_hw_state)(struct intel_plane *plane, enum pipe
> *pipe);
> -	int (*check_plane)(struct intel_plane *plane,
> -			   struct intel_crtc_state *crtc_state,
> -			   struct intel_plane_state *state);
> +	int (*check_plane)(struct intel_crtc_state *crtc_state,
> +			   struct intel_plane_state *plane_state);
>  };
>  
>  struct intel_watermark_params {
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c
> b/drivers/gpu/drm/i915/intel_sprite.c
> index c286dda625e4..9600ccfc5b76 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -959,10 +959,10 @@ g4x_plane_get_hw_state(struct intel_plane
> *plane,
>  }
>  
>  static int
> -intel_check_sprite_plane(struct intel_plane *plane,
> -			 struct intel_crtc_state *crtc_state,
> +intel_check_sprite_plane(struct intel_crtc_state *crtc_state,
>  			 struct intel_plane_state *state)
>  {
> +	struct intel_plane *plane = to_intel_plane(state->base.plane);
>  	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
>  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
>  	struct drm_framebuffer *fb = state->base.fb;