Merge "msm: mdss: fix TCXO issue on 8909MTP" (a5de1dd3) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdp3.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -2217,10 +2217,8 @@ static int mdp3_is_display_on(struct mdss_panel_data *pdata)

		mdp3_res->splash_mem_addr = MDP3_REG_READ(MDP3_REG_DMA_P_IBUF_ADDR);

		if (pdata->panel_info.type == MIPI_CMD_PANEL) {
		if (mdp3_clk_enable(0, 0))
		pr_err("fail to turn off MDP core clks\n");
		}
		return rc;
		}

		@@ -2782,11 +2780,8 @@ int mdp3_panel_get_intf_status(u32 disp_num, u32 intf_type)
		/* DSI video mode or command mode */
		rc = (status == 0x180000) \|\| (status == 0x080000);

		/* For Video mode panel do not disable clock */
		if (!(status == 0x180000)) {
		if (mdp3_clk_enable(0, 0))
		pr_err("fail to turn off MDP core clks\n");
		}
		return rc;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -1122,7 +1122,7 @@ int mdp3_ctrl_reset(struct msm_fb_data_type *mfd)
		pr_debug("mdp3_ctrl_reset idle_pc %s FS_EN %s\n",
		mdp3_res->idle_pc ? "True":"False",
		mdp3_res->fs_ena ? "True":"False");
		if (mdp3_res->idle_pc \|\| mdp3_res->fs_ena) {
		if (mdp3_res->idle_pc) {
		mdp3_clk_enable(1, 0);
		mdp3_dynamic_clock_gating_ctrl(0);
		mdp3_qos_remapper_setup(panel);
		@@ -1131,7 +1131,7 @@ int mdp3_ctrl_reset(struct msm_fb_data_type *mfd)
		rc = mdp3_iommu_enable(MDP3_CLIENT_DMA_P);
		if (rc) {
		pr_err("fail to attach dma iommu\n");
		if (mdp3_res->idle_pc \|\| mdp3_res->fs_ena)
		if (mdp3_res->idle_pc)
		mdp3_clk_enable(0, 0);
		goto reset_error;
		}