On Fri, Jan 15, 2016 at 08:48:26PM +0200, Ville Syrjälä wrote: > On Thu, Oct 15, 2015 at 05:01:58PM +0300, ville.syrjala@xxxxxxxxxxxxxxx wrote: > > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > > > Pass BIT(DRM_ROTATE_0) instead of DRM_ROTATE_0 to skl_update_scaler(). > > The former is a mask, the latter just the bit number. > > > > Fortunately the only thing skl_update_scaler() does with the rotation > > is check if it's 90/270 degrees or not, and so in this case it would > > still do the right thing. > > > > Cc: Chandra Konduru <chandra.konduru@xxxxxxxxx> > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Ping, anyone care to r-b this one? Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx> Looks like this bug has been present since scalers were first added in 6156a45602f9 ("drm/i915: skylake primary plane scaling using shared scalers") Matt > > > --- > > drivers/gpu/drm/i915/intel_display.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 7498c9d..02316d0 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -4673,7 +4673,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state) > > intel_crtc->base.base.id, intel_crtc->pipe, SKL_CRTC_INDEX); > > > > return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX, > > - &state->scaler_state.scaler_id, DRM_ROTATE_0, > > + &state->scaler_state.scaler_id, BIT(DRM_ROTATE_0), > > state->pipe_src_w, state->pipe_src_h, > > adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay); > > } > > -- > > 2.4.9 > > -- > Ville Syrjälä > Intel OTC > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx