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

Commit 05515c99 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: reset WB mixercfg during WB destroy"

parents 11cbe461 d548b09d

drivers/video/msm/mdss/mdss_mdp.h

+1 −0
Original line number Diff line number Diff line
@@ -1454,6 +1454,7 @@ int mdss_mdp_mixer_pipe_update(struct mdss_mdp_pipe *pipe, 
int mdss_mdp_mixer_pipe_unstage(struct mdss_mdp_pipe *pipe,

	struct mdss_mdp_mixer *mixer);

void mdss_mdp_mixer_unstage_all(struct mdss_mdp_mixer *mixer);

void mdss_mdp_reset_mixercfg(struct mdss_mdp_ctl *ctl);

int mdss_mdp_display_commit(struct mdss_mdp_ctl *ctl, void *arg,

	struct mdss_mdp_commit_cb *commit_cb);

int mdss_mdp_display_wait4comp(struct mdss_mdp_ctl *ctl);

drivers/video/msm/mdss/mdss_mdp_ctl.c

+4 −5
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static struct { 


static void __mdss_mdp_mixer_write_cfg(struct mdss_mdp_mixer *mixer,

		struct mdss_mdp_mixer_cfg *cfg);

static void __mdss_mdp_reset_mixercfg(struct mdss_mdp_ctl *ctl);



static inline u64 fudge_factor(u64 val, u32 numer, u32 denom)

{
@@ -3809,10 +3808,10 @@ int mdss_mdp_ctl_stop(struct mdss_mdp_ctl *ctl, int power_state) 
	mdss_mdp_ctl_write(ctl, MDSS_MDP_REG_CTL_TOP, 0);

	if (sctl) {

		mdss_mdp_ctl_write(sctl, MDSS_MDP_REG_CTL_TOP, 0);

		__mdss_mdp_reset_mixercfg(sctl);

		mdss_mdp_reset_mixercfg(sctl);

	}



	__mdss_mdp_reset_mixercfg(ctl);

	mdss_mdp_reset_mixercfg(ctl);



	ctl->play_cnt = 0;
@@ -4147,7 +4146,7 @@ static void __mdss_mdp_mixer_write_cfg(struct mdss_mdp_mixer *mixer, 
	MDSS_XLOG(mixer->num, vals[0], vals[1]);

}



static void __mdss_mdp_reset_mixercfg(struct mdss_mdp_ctl *ctl)

void mdss_mdp_reset_mixercfg(struct mdss_mdp_ctl *ctl)

{

	u32 vals[NUM_MIXERCFG_REGS] = {0};

	int i, nmixers;
@@ -4246,7 +4245,7 @@ static void mdss_mdp_mixer_setup(struct mdss_mdp_ctl *master_ctl, 
	    is_dsc_compression(&ctl->panel_data->panel_info) &&

	    ctl->panel_data->panel_info.partial_update_enabled &&

	    mdss_has_quirk(mdata, MDSS_QUIRK_DSC_RIGHT_ONLY_PU))

		__mdss_mdp_reset_mixercfg(ctl_hw);

		mdss_mdp_reset_mixercfg(ctl_hw);



	if (!mixer->valid_roi) {

		/*

drivers/video/msm/mdss/mdss_mdp_wfd.c

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ void mdss_mdp_wfd_destroy(struct mdss_mdp_wfd *wfd) 
	if (ctl->ops.stop_fnc)

		ctl->ops.stop_fnc(ctl, 0);



	mdss_mdp_reset_mixercfg(ctl);



	if (ctl->wb)

		mdss_mdp_wb_free(ctl->wb);