Merge "msm: mdss: Add check for SPI client" (192fd35b) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/video/fbdev/msm/mdp3.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -1429,6 +1429,7 @@ int mdp3_get_img(struct msmfb_data img, struct mdp3_img_data data, int client)
		data->srcp_dma_buf = NULL;
		return ret;
		}
		if (client == MDP3_CLIENT_SPI) {
		data->srcp_ihdl = ion_import_dma_buf(iclient,
		data->srcp_dma_buf);
		if (IS_ERR_OR_NULL(data->srcp_ihdl)) {
		@@ -1436,6 +1437,7 @@ int mdp3_get_img(struct msmfb_data img, struct mdp3_img_data data, int client)
		data->srcp_ihdl = NULL;
		return -EIO;
		}
		}
		data->srcp_attachment =
		mdss_smmu_dma_buf_attach(data->srcp_dma_buf,
		&mdp3_res->pdev->dev, dom);