[Intel-gfx] [PATCH 04/15] drm/i915: Stage scaler request for NV12 as src format

[Ville Syrjälä]

On Fri, Sep 04, 2015 at 07:33:00PM -0700, Chandra Konduru wrote:
> This patch stages a scaler request when input format
> is NV12. The same scaler does both chroma-upsampling
> and resolution scaling as needed.
> 
> v2:
> -Added helper function for need_scaling (Ville)
> 
> v3:
> -Rebased to current kernel version 4.2.0.rc4 (me)
> 
> v4:
> -minor updates (Ville)
> 
> Signed-off-by: Chandra Konduru <chandra.konduru at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c |   34 +++++++++++++++++++++++++++-------
>  1 file changed, 27 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 3ee1c17..8869779 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4341,20 +4341,38 @@ static void cpt_verify_modeset(struct drm_device *dev, int pipe)
>  	}
>  }
>  
> +static bool skl_need_scaling(int src_w, int src_h, int dst_w, int dst_h,
> +	unsigned int rotation, uint32_t pixel_format)
> +{
> +	/* need a scaler when sizes doesn't match */
> +	if (src_w != dst_w || src_h != dst_h)
> +		return true;
> +
> +	/* in case of 90/270 rotation, check src width with dst height and so */
> +	if (intel_rotation_90_or_270(rotation) &&
> +			(src_h != dst_w || src_w != dst_h))
> +		return true;
> +
> +	/* need a scaler for nv12 */
> +	if (pixel_format == DRM_FORMAT_NV12)
> +		return true;
> +
> +	return false;
> +}

That still looks wrong to me. Let me repeat how I think it should look:

{
	if (format == NV12)
		return true;

	if (90_or_270())
		return src_w != dst_h || src_h != dst_w;
	else
		return src_w != dst_w || src_h != dst_h;
}

Otherwise looks good.

> +
>  static int
>  skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,
>  		  unsigned scaler_user, int *scaler_id, unsigned int rotation,
> -		  int src_w, int src_h, int dst_w, int dst_h)
> +		  int src_w, int src_h, int dst_w, int dst_h, uint32_t pixel_format)
>  {
>  	struct intel_crtc_scaler_state *scaler_state =
>  		&crtc_state->scaler_state;
>  	struct intel_crtc *intel_crtc =
>  		to_intel_crtc(crtc_state->base.crtc);
> -	int need_scaling;
> +	bool need_scaling;
>  
> -	need_scaling = intel_rotation_90_or_270(rotation) ?
> -		(src_h != dst_w || src_w != dst_h):
> -		(src_w != dst_w || src_h != dst_h);
> +	need_scaling = skl_need_scaling(src_w, src_h, dst_w, dst_h, rotation,
> +		pixel_format);
>  
>  	/*
>  	 * if plane is being disabled or scaler is no more required or force detach
> @@ -4423,7 +4441,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)
>  	return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX,
>  		&state->scaler_state.scaler_id, DRM_ROTATE_0,
>  		state->pipe_src_w, state->pipe_src_h,
> -		adjusted_mode->hdisplay, adjusted_mode->vdisplay);
> +		adjusted_mode->hdisplay, adjusted_mode->vdisplay, 0);
>  }
>  
>  /**
> @@ -4459,7 +4477,8 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
>  				drm_rect_width(&plane_state->src) >> 16,
>  				drm_rect_height(&plane_state->src) >> 16,
>  				drm_rect_width(&plane_state->dst),
> -				drm_rect_height(&plane_state->dst));
> +				drm_rect_height(&plane_state->dst),
> +				fb ? fb->pixel_format : 0);
>  
>  	if (ret || plane_state->scaler_id < 0)
>  		return ret;
> @@ -4484,6 +4503,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
>  	case DRM_FORMAT_YVYU:
>  	case DRM_FORMAT_UYVY:
>  	case DRM_FORMAT_VYUY:
> +	case DRM_FORMAT_NV12:
>  		break;
>  	default:
>  		DRM_DEBUG_KMS("[PLANE:%d] FB:%d unsupported scaling format 0x%x\n",
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC