[Intel-gfx] [PATCH 1/3] drm/i915: Add some missing curly braces
Ville Syrjälä
ville.syrjala at linux.intel.com
Tue Mar 19 14:42:35 UTC 2019
On Mon, Mar 18, 2019 at 01:34:37PM -0700, Rodrigo Vivi wrote:
> On Mon, Mar 18, 2019 at 10:26:51PM +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >
> > Sprinkle some curly braces in accordance with the coding style.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
Thanks. Series pushed to dinq.
>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 11 +++++++----
> > 1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 61acbaf2af75..bfe792789a52 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -1621,14 +1621,15 @@ static void ironlake_enable_pch_transcoder(const struct intel_crtc_state *crtc_s
> > }
> >
> > val &= ~TRANS_INTERLACE_MASK;
> > - if ((pipeconf_val & PIPECONF_INTERLACE_MASK) == PIPECONF_INTERLACED_ILK)
> > + if ((pipeconf_val & PIPECONF_INTERLACE_MASK) == PIPECONF_INTERLACED_ILK) {
> > if (HAS_PCH_IBX(dev_priv) &&
> > intel_crtc_has_type(crtc_state, INTEL_OUTPUT_SDVO))
> > val |= TRANS_LEGACY_INTERLACED_ILK;
> > else
> > val |= TRANS_INTERLACED;
> > - else
> > + } else {
> > val |= TRANS_PROGRESSIVE;
> > + }
> >
> > I915_WRITE(reg, val | TRANS_ENABLE);
> > if (intel_wait_for_register(dev_priv,
> > @@ -7759,8 +7760,9 @@ static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state)
> > pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION;
> > else
> > pipeconf |= PIPECONF_INTERLACE_W_SYNC_SHIFT;
> > - } else
> > + } else {
> > pipeconf |= PIPECONF_PROGRESSIVE;
> > + }
> >
> > if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
> > crtc_state->limited_color_range)
> > @@ -8876,8 +8878,9 @@ static void ironlake_compute_dpll(struct intel_crtc *intel_crtc,
> > dev_priv->vbt.lvds_ssc_freq == 100000) ||
> > (HAS_PCH_IBX(dev_priv) && intel_is_dual_link_lvds(dev)))
> > factor = 25;
> > - } else if (crtc_state->sdvo_tv_clock)
> > + } else if (crtc_state->sdvo_tv_clock) {
> > factor = 20;
> > + }
> >
> > fp = i9xx_dpll_compute_fp(&crtc_state->dpll);
> >
> > --
> > 2.19.2
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
More information about the Intel-gfx
mailing list