> Subject: [PATCH 16/16] drm/i915/dpio: Use the intel_de_wait_ms() out value >
> > Utilize the 'out_value' output parameter of intel_de_wait_ms() isntead of re- > readiong the DPLL/DPIO_PHY_STATUS register after polling has finished. * re-reading With that fixed Reviewed-by: Suraj Kandpal <[email protected]> > > Signed-off-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_dpio_phy.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dpio_phy.c > b/drivers/gpu/drm/i915/display/intel_dpio_phy.c > index 7b7a0461da36..8027bab2951b 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpio_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_dpio_phy.c > @@ -1173,6 +1173,7 @@ void vlv_wait_port_ready(struct intel_encoder > *encoder, > struct intel_display *display = to_intel_display(encoder); > u32 port_mask; > i915_reg_t dpll_reg; > + u32 val; > > switch (encoder->port) { > default: > @@ -1193,10 +1194,9 @@ void vlv_wait_port_ready(struct intel_encoder > *encoder, > break; > } > > - if (intel_de_wait_ms(display, dpll_reg, port_mask, expected_mask, > 1000, NULL)) > + if (intel_de_wait_ms(display, dpll_reg, port_mask, expected_mask, > +1000, &val)) > drm_WARN(display->drm, 1, > "timed out waiting for [ENCODER:%d:%s] port ready: > got 0x%x, expected 0x%x\n", > encoder->base.base.id, encoder->base.name, > - intel_de_read(display, dpll_reg) & port_mask, > - expected_mask); > + val & port_mask, expected_mask); > } > -- > 2.49.1
