On Wed, Aug 19, 2015 at 06:02:26PM -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) > > Signed-off-by: Chandra Konduru <chandra.konduru@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++++++++++++------ > 1 file changed, 24 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 3ee1c17..411b211 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -4341,10 +4341,27 @@ static void cpt_verify_modeset(struct drm_device *dev, int pipe) > } > } > > +static int skl_need_scaling(int src_w, int dst_w, int src_h, int dst_h, Make it bool. I'd reorder the arguments to group src_w and src_h together, and dst_w and dst_h together. > + int rotation, uint32_t pixel_format) Indentation is weird. rotation should be unsigned int. > +{ > + /* scaling is required when src dst sizes doesn't match or format is NV12 */ > + if (src_w != dst_w || src_h != dst_h) > + return 1; > + > + if (intel_rotation_90_or_270(rotation) && > + (src_h != dst_w || src_w != dst_h)) > + return 1; I would make this something like: { if (format == NV12) return true; if (90_270) return ...; else return ...; } > + > + if (pixel_format == DRM_FORMAT_NV12) > + return 1; > + > + return 0; > +} > + > 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; > @@ -4352,9 +4369,8 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, > to_intel_crtc(crtc_state->base.crtc); > int 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, dst_w, src_h, dst_h, rotation, > + pixel_format); > > /* > * if plane is being disabled or scaler is no more required or force detach > @@ -4423,7 +4439,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 +4475,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 +4501,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@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx