On Thu, 04 Dec 2014, Gaurav K Singh <gaurav.k.singh@xxxxxxxxx> wrote: > Instead of pipe configuration reg, cck reg to be used for checking whether > DSI Pll is getting locked or not. > > Signed-off-by: Gaurav K Singh <gaurav.k.singh@xxxxxxxxx> > Signed-off-by: Shobhit Kumar <shobhit.kumar@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_dsi_pll.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dsi_pll.c b/drivers/gpu/drm/i915/intel_dsi_pll.c > index 636d72f..dd45484 100644 > --- a/drivers/gpu/drm/i915/intel_dsi_pll.c > +++ b/drivers/gpu/drm/i915/intel_dsi_pll.c > @@ -272,12 +272,13 @@ void vlv_enable_dsi_pll(struct intel_encoder *encoder) > tmp |= DSI_PLL_VCO_EN; > vlv_cck_write(dev_priv, CCK_REG_DSI_PLL_CONTROL, tmp); > > - mutex_unlock(&dev_priv->dpio_lock); > + if (wait_for(vlv_cck_read(dev_priv, CCK_REG_DSI_PLL_CONTROL) & > + DSI_PLL_LOCK, 20)) { > > - if (wait_for(I915_READ(PIPECONF(PIPE_A)) & PIPECONF_DSI_PLL_LOCKED, 20)) { > DRM_ERROR("DSI PLL lock failed\n"); > return; > } > + mutex_unlock(&dev_priv->dpio_lock); If DSI PLL lock fails, you leave dpio_lock locked. BR, Jani. > > DRM_DEBUG_KMS("DSI PLL locked\n"); > } > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx