On Fri, Jun 01, 2018 at 01:29:12PM +0300, Mika Kahola wrote: > On Tue, 2018-01-30 at 22:38 +0200, Ville Syrjala wrote: > > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > > > Call the enum i9xx_plane_id variable i9xx_plane like we do elsewhere. > > > > Cc: Hans de Goede <j.w.r.degoede@xxxxxxxxx> > > Reviewed-by: Mika Kahola <mika.kahola@xxxxxxxxx> Thanks. Remainder of the series pushed. > > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > --- > > drivers/gpu/drm/i915/intel_dsi.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_dsi.c > > b/drivers/gpu/drm/i915/intel_dsi.c > > index 51a1d6868b1e..9f378aa2dc5b 100644 > > --- a/drivers/gpu/drm/i915/intel_dsi.c > > +++ b/drivers/gpu/drm/i915/intel_dsi.c > > @@ -1665,16 +1665,16 @@ static int > > intel_dsi_get_panel_orientation(struct intel_connector *connector) > > { > > struct drm_i915_private *dev_priv = to_i915(connector- > > >base.dev); > > int orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL; > > - enum i9xx_plane_id plane; > > + enum i9xx_plane_id i9xx_plane; > > u32 val; > > > > if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > > if (connector->encoder->crtc_mask == BIT(PIPE_B)) > > - plane = PLANE_B; > > + i9xx_plane = PLANE_B; > > else > > - plane = PLANE_A; > > + i9xx_plane = PLANE_A; > > > > - val = I915_READ(DSPCNTR(plane)); > > + val = I915_READ(DSPCNTR(i9xx_plane)); > > if (val & DISPPLANE_ROTATE_180) > > orientation = > > DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP; > > } > -- > Mika Kahola - Intel OTC -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx