Merge "msm: mdss: Read status value from master controller" (2503bc24) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/video/fbdev/msm/mdss_dsi_host.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -2186,6 +2186,7 @@ static int mdss_dsi_cmd_dma_rx(struct mdss_dsi_ctrl_pdata *ctrl,
		bool ack_error = false;
		char reg[16];
		int repeated_bytes = 0;
		struct mdss_dsi_ctrl_pdata *mctrl = mdss_dsi_get_other_ctrl(ctrl);

		lp = (u32 *)rp->data;
		temp = (u32 *)reg;
		@@ -2246,7 +2247,11 @@ static int mdss_dsi_cmd_dma_rx(struct mdss_dsi_ctrl_pdata *ctrl,
		off += ((cnt - 1) * 4);

		for (i = 0; i < cnt; i++) {
		if (mdss_dsi_sync_wait_trigger(ctrl))
		data = (u32)MIPI_INP((mctrl->ctrl_base) + off);
		else
		data = (u32)MIPI_INP((ctrl->ctrl_base) + off);

		/* to network byte order */
		if (!repeated_bytes)
		*lp++ = ntohl(data);