Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3770f0ee authored by Gaurav K Singh's avatar Gaurav K Singh Committed by Daniel Vetter
Browse files

drm/i915: cck reg used for checking DSI Pll locked 



Instead of pipe configuration reg, cck reg to be used for checking whether
DSI Pll is getting locked or not.

v2: dpio_lock unlocked now in case DSI PLL lock fails

Signed-off-by: default avatarGaurav K Singh <gaurav.k.singh@intel.com>
Signed-off-by: default avatarShobhit Kumar <shobhit.kumar@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 58cf8887

drivers/gpu/drm/i915/intel_dsi_pll.c

+4 −2
Original line number Diff line number Diff line
@@ -272,12 +272,14 @@ 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)) {

		mutex_unlock(&dev_priv->dpio_lock);

		DRM_ERROR("DSI PLL lock failed\n");

		return;

	}

	mutex_unlock(&dev_priv->dpio_lock);



	DRM_DEBUG_KMS("DSI PLL locked\n");

}