[Intel-gfx] [PATCH 08/10] drm/i915: Split cursor check_plane into i845 and i9xx variants

[Chris Wilson]

On Tue, Mar 07, 2017 at 05:27:07PM +0200, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> The 845/865 and 830/855/9xx+ style cursor don't have that
> much in common with each other, so let's just split the
> .check_plane() hook into two variants as well.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 232 ++++++++++++++++++++++-------------
>  1 file changed, 145 insertions(+), 87 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 222f54ffd113..41cbaee66f1b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9269,6 +9269,74 @@ static void i845_disable_cursor(struct intel_plane *plane,
>  	i845_update_cursor(plane, NULL, NULL);
>  }
>  
> +static bool i845_cursor_size_ok(const struct intel_plane_state *plane_state)
> +{
> +	struct drm_i915_private *dev_priv =
> +		to_i915(plane_state->base.plane->dev);
> +	int width = plane_state->base.crtc_w;
> +	int height = plane_state->base.crtc_h;
> +
> +	if (width == 0 || height == 0)
> +		return false;
> +
> +	/*
> +	 * 845g/865g are only limited by the width of their cursors,
> +	 * the height is arbitrary up to the precision of the register.
> +	 */
> +	if ((width & 63) != 0)

if (!IS_ALIGNED(width, 64)) ?

> +		return false;
> +
> +	if (width > (IS_I845G(dev_priv) ? 64 : 512))
> +		return false;
> +
> +	if (height > 1023)
> +		return false;
> +
> +	return true;
> +}

>  static void i9xx_update_cursor(struct intel_plane *plane,
>  			       const struct intel_crtc_state *crtc_state,
>  			       const struct intel_plane_state *plane_state)
> @@ -9328,41 +9396,92 @@ static void i9xx_disable_cursor(struct intel_plane *plane,
>  	i9xx_update_cursor(plane, NULL, NULL);
>  }
>  
> -static bool cursor_size_ok(struct drm_i915_private *dev_priv,
> -			   uint32_t width, uint32_t height)
> +static bool i9xx_cursor_size_ok(const struct intel_plane_state *plane_state)
>  {
> +	struct drm_i915_private *dev_priv =
> +		to_i915(plane_state->base.plane->dev);
> +	int width = plane_state->base.crtc_w;
> +	int height = plane_state->base.crtc_h;
> +
>  	if (width == 0 || height == 0)
>  		return false;
>  
>  	/*
> -	 * 845g/865g are special in that they are only limited by
> -	 * the width of their cursors, the height is arbitrary up to
> -	 * the precision of the register. Everything else requires
> -	 * square cursors, limited to a few power-of-two sizes.
> +	 * Cursors are limited to a few power-of-two
> +	 * sizes, and they must be square.
>  	 */
> -	if (IS_I845G(dev_priv) || IS_I865G(dev_priv)) {
> -		if ((width & 63) != 0)
> +	switch (width | height) {
> +	case 256:
> +	case 128:
> +		if (IS_GEN2(dev_priv))
>  			return false;
> +	case 64:
> +		break;
> +	default:
> +		return false;

Checks out ok.

> +	}

There's still quite a bit of boilerplate duplication between the two
check_plane functions. No chance for some sharing? I presume their is
also an ulterior motive for the split in later patches. That would be
worth mentioning in the changelog to quell some of the doubts over
duplication.

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

-- 
Chris Wilson, Intel Open Source Technology Centre