Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd47f376 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: fix un-clocked register access when rotator is used"

parents fc53ef4c ec777856

drivers/video/msm/mdss/mdss_mdp_ctl.c

+2 −0
Original line number Diff line number Diff line
@@ -2637,6 +2637,7 @@ int mdss_mdp_display_wait4comp(struct mdss_mdp_ctl *ctl) 
	mdss_mdp_ctl_perf_update(ctl, 0);



	if (IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_103)) {

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);

		reg_data = mdss_mdp_ctl_read(ctl, MDSS_MDP_REG_CTL_FLUSH);

		flush_data = readl_relaxed(mdata->mdp_base + AHB_CLK_OFFSET);

		if ((flush_data & BIT(28)) &&
@@ -2647,6 +2648,7 @@ int mdss_mdp_display_wait4comp(struct mdss_mdp_ctl *ctl) 
					 mdata->mdp_base + AHB_CLK_OFFSET);

			ctl->flush_reg_data = 0;

		}

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);

	}



	mutex_unlock(&ctl->lock);