Merge "msm: mdss: acquire pipe before overlay start in pan display" (dffb761b) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_mdp_overlay.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -2444,18 +2444,6 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd)
		goto clk_disable;
		}

		ret = mdss_mdp_overlay_start(mfd);
		if (ret) {
		pr_err("unable to start overlay %d (%d)\n", mfd->index, ret);
		goto clk_disable;
		}

		ret = mdss_iommu_ctrl(1);
		if (IS_ERR_VALUE(ret)) {
		pr_err("IOMMU attach failed\n");
		goto clk_disable;
		}

		ret = mdss_mdp_overlay_get_fb_pipe(mfd, &l_pipe,
		MDSS_MDP_MIXER_MUX_LEFT, &l_pipe_allocated);
		if (ret) {
		@@ -2468,6 +2456,18 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd)
		goto pipe_release;
		}

		ret = mdss_mdp_overlay_start(mfd);
		if (ret) {
		pr_err("unable to start overlay %d (%d)\n", mfd->index, ret);
		goto clk_disable;
		}

		ret = mdss_iommu_ctrl(1);
		if (IS_ERR_VALUE(ret)) {
		pr_err("IOMMU attach failed\n");
		goto clk_disable;
		}

		buf_l = __mdp_overlay_buf_alloc(mfd, l_pipe);
		if (!buf_l) {
		pr_err("unable to allocate memory for fb buffer\n");