From: Philipp Zabel Date: Mon, 14 Apr 2014 21:53:21 +0000 (+0200) Subject: imx-drm: imx-dp: when disabling the DP foreground channel, wait until the DP backgrou... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=216ddd608fb4f993d2f80ddbf1297abe10935a89;p=deliverable%2Flinux.git imx-drm: imx-dp: when disabling the DP foreground channel, wait until the DP background channel is finished before disabling the IDMAC channel Signed-off-by: Philipp Zabel Signed-off-by: Russell King --- diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c index 6980fa125517..d90f82a87d19 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c @@ -277,6 +277,9 @@ void ipu_dp_disable_channel(struct ipu_dp *dp) writel(0, flow->base + DP_FG_POS); ipu_srm_dp_sync_update(priv->ipu); + if (ipu_idmac_channel_busy(priv->ipu, IPUV3_CHANNEL_MEM_BG_SYNC)) + ipu_wait_interrupt(priv->ipu, IPU_IRQ_DP_SF_END, 50); + mutex_unlock(&priv->mutex); } EXPORT_SYMBOL_GPL(ipu_dp_disable_channel);