Merge "msm: mdp3: xlog dump on fatal error" (46cbd43a) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/video/fbdev/msm/mdp3.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1354,6 +1354,8 @@ int mdp3_put_img(struct mdp3_img_data *data, int client)
		pr_err("invalid ion client\n");
		return -ENOMEM;
		}
		MDSS_XLOG(data->srcp_dma_buf, data->addr, data->len, client,
		data->mapped, data->skip_detach);
		if (data->mapped) {
		if (client == MDP3_CLIENT_PPP \|\|
		client == MDP3_CLIENT_DMA_P)
		@@ -1520,6 +1522,13 @@ int mdp3_get_img(struct msmfb_data img, struct mdp3_img_data data, int client)
		mdp3_put_img(data, client);
		return -EINVAL;
		}
		if (img->flags & MDP_MEMORY_ID_TYPE_FB) {
		MDSS_XLOG(img->memory_id, data->addr, data->len, fb_num);
		} else if (iclient) {
		MDSS_XLOG(img->memory_id, data->srcp_dma_buf, data->addr,
		data->len, client, data->mapped,
		data->skip_detach);
		}
		return ret;

		clone_err:

+5 −1

Original line number	Diff line number	Diff line
		@@ -705,6 +705,10 @@ static int mdp3_dmap_update(struct mdp3_dma dma, void buf,
		rc = -1;
		}
		ATRACE_END("mdp3_wait_for_dma_comp");
		if (rc <= 0 && retry_count == 0) {
		MDSS_XLOG_TOUT_HANDLER("mdp", "vbif",
		"dsi0_ctrl", "dsi0_phy");
		}
		}
		}
		if (dma->update_src_cfg) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -318,10 +318,12 @@ int mdp3_ppp_pipe_wait(void)
		*/
		ret = wait_for_completion_timeout(
		&ppp_stat->ppp_comp, msecs_to_jiffies(200));
		if (!ret)
		if (!ret) {
		pr_err("%s: Timed out waiting for the MDP.\n",
		__func__);

		MDSS_XLOG_TOUT_HANDLER("mdp", "vbif",
		"dsi0_ctrl", "dsi0_phy");
		}
		return ret;
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -517,7 +517,8 @@ int mdss_smmu_fault_handler(struct iommu_domain domain, struct device dev,
		} else {
		pr_err("mdss_smmu: iova:0x%lx flags:0x%x\n",
		iova, flags);
		MDSS_XLOG_TOUT_HANDLER("mdp");
		MDSS_XLOG_TOUT_HANDLER("mdp", "vbif", "dsi0_ctrl",
		"dsi0_phy");
		}
		end:
		return -ENODEV;