[Intel-gfx] [PATCH] drm/i915: Handle YUV subpixel support better

[Ville Syrjälä]

On Mon, Mar 18, 2019 at 03:07:18PM +0100, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_sprite.c | 29 +++++++++++++++++++----------
>  1 file changed, 19 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 268fb34ff0e2..862fc172042f 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -269,7 +269,8 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
>  {
>  	const struct drm_framebuffer *fb = plane_state->base.fb;
>  	struct drm_rect *src = &plane_state->base.src;
> -	u32 src_x, src_y, src_w, src_h;
> +	u32 src_x, src_y, src_w, src_h, hsub, vsub;
> +	bool rotated = drm_rotation_90_or_270(plane_state->base.rotation);
>  
>  	/*
>  	 * Hardware doesn't handle subpixel coordinates.
> @@ -287,18 +288,26 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
>  	src->y1 = src_y << 16;
>  	src->y2 = (src_y + src_h) << 16;
>  
> -	if (fb->format->is_yuv &&
> -	    (src_x & 1 || src_w & 1)) {
> -		DRM_DEBUG_KMS("src x/w (%u, %u) must be a multiple of 2 for YUV planes\n",
> -			      src_x, src_w);
> +	if (!fb->format->is_yuv)
> +		return 0;
> +
> +	/* YUV specific checks */
> +	if (!rotated) {
> +		hsub = fb->format->hsub;
> +		vsub = fb->format->vsub;
> +	} else {
> +		hsub = vsub = max(fb->format->hsub, fb->format->vsub);

Why this? From the looks of things there should be no need to deal with
rotation in this function at all.

> +	}
> +
> +	if (src_x % hsub || src_w % hsub) {
> +		DRM_DEBUG_KMS("src x/w (%u, %u) must be a multiple of %u for %sYUV planes\n",
> +			      src_x, src_w, hsub, rotated ? "rotated " : "");
>  		return -EINVAL;
>  	}
>  
> -	if (fb->format->is_yuv &&
> -	    fb->format->num_planes > 1 &&
> -	    (src_y & 1 || src_h & 1)) {
> -		DRM_DEBUG_KMS("src y/h (%u, %u) must be a multiple of 2 for planar YUV planes\n",
> -			      src_y, src_h);
> +	if (src_y % vsub || src_h % vsub) {
> +		DRM_DEBUG_KMS("src y/h (%u, %u) must be a multiple of %u for %sYUV planes\n",
> +			      src_y, src_h, vsub, rotated ? "rotated " : "");
>  		return -EINVAL;
>  	}
>  
> -- 
> 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