Merge "msm: mdss: dsi: use right mask to confirm dma transfer done"

	ret = wait_for_completion_timeout(&ctrl->dma_comp,

				msecs_to_jiffies(DMA_TX_TIMEOUT));

	if (ret <= 0) {

		u32 reg_val, status, mask;

	if (ret == 0) {

		u32 reg_val, status;

		reg_val = MIPI_INP(ctrl->ctrl_base + 0x0110);/* DSI_INTR_CTRL */

		mask = reg_val & DSI_INTR_CMD_DMA_DONE_MASK;

		status = mask & reg_val;

		status = reg_val & DSI_INTR_CMD_DMA_DONE;

		if (status) {

			pr_warn("dma tx done but irq not triggered\n");

			reg_val &= DSI_INTR_MASK_ALL;

			/* clear CMD DMA isr only */

			reg_val |= DSI_INTR_CMD_DMA_DONE;

			MIPI_OUTP(ctrl->ctrl_base + 0x0110, reg_val);

			mdss_dsi_disable_irq_nosync(ctrl, DSI_MDP_TERM);

			mdss_dsi_disable_irq_nosync(ctrl, DSI_CMD_TERM);

			complete(&ctrl->dma_comp);

			ret = 1;

			pr_warn("%s: dma tx done but irq not triggered\n",

				__func__);

		} else {

			ret = -ETIMEDOUT;

		}

	}

	if (ret == 0)

		ret = -ETIMEDOUT;

	else

	if (!IS_ERR_VALUE(ret))

		ret = tp->len;

	if (mctrl && mctrl->dma_addr) {