Merge "msm: mdss: Retrict use of DMA Multi-Rect for FB pan_display" (3d82d664) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_mdp_overlay.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -3053,6 +3053,13 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd)
		goto pipe_release;
		}

		if (l_pipe_allocated &&
		(l_pipe->multirect.num == MDSS_MDP_PIPE_RECT1)) {
		pr_err("Invalid: L_Pipe-%d is assigned for RECT-%d\n",
		l_pipe->num, l_pipe->multirect.num);
		goto pipe_release;
		}

		if (mdss_mdp_pipe_map(l_pipe)) {
		pr_err("unable to map base pipe\n");
		goto pipe_release;
		@@ -3100,6 +3107,16 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd)
		goto iommu_disable;
		}

		if (l_pipe_allocated && r_pipe_allocated &&
		(l_pipe->num != r_pipe->num) &&
		(r_pipe->multirect.num ==
		MDSS_MDP_PIPE_RECT1)) {
		pr_err("Invalid: L_Pipe-%d,RECT-%d R_Pipe-%d,RECT-%d\n",
		l_pipe->num, l_pipe->multirect.num,
		r_pipe->num, l_pipe->multirect.num);
		goto iommu_disable;
		}

		if (mdss_mdp_pipe_map(r_pipe)) {
		pr_err("unable to map right base pipe\n");
		goto iommu_disable;