On Mon, Dec 04, 2017 at 04:04:15PM -0800, Rodrigo Vivi wrote: > When commit '82daca297506 ("drm/i915: Add "panel orientation" > property to the panel connector, v6.")' was done and tested > by CI, commit 'ed15030d7ab0 ("drm/i915: s/enum plane/enum > i9xx_plane_id/")' wasn't there already. > > On this race the second patch got merged first so the first one > broke i915 compilation. Thanks to Michel this was found quickly. > > Cc: Michel Thierry <michel.thierry@xxxxxxxxx> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> > Cc: Hans de Goede <hdegoede@xxxxxxxxxx> > Suggested-by: Michel Thierry <michel.thierry@xxxxxxxxx> > Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.") > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_dsi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c > index 1b60df3c14a0..f67d321376e4 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.c > +++ b/drivers/gpu/drm/i915/intel_dsi.c > @@ -1670,7 +1670,7 @@ 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 plane plane; > + enum i9xx_plane_id plane; s/plane/i9xx_plane/ for consistency Not that I particularly like having this code here in the first place. Ideally it would be part of proper plane state readout, but since we don't have that I think it should be in some more central place so that every connector can use it. > u32 val; > > if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > -- > 2.13.6 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx