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

Commit 49ec8c5d 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: update mixer pipe_mapped value during overlay_off"

parents 2591d60c d60d7e26

drivers/video/msm/mdss/mdss_mdp.h

+2 −1
Original line number Diff line number Diff line
@@ -1412,7 +1412,8 @@ struct mdss_mdp_ctl *mdss_mdp_ctl_mixer_switch(struct mdss_mdp_ctl *ctl, 
					       u32 return_type);

void mdss_mdp_set_roi(struct mdss_mdp_ctl *ctl,

	struct mdss_rect *l_roi, struct mdss_rect *r_roi);



void mdss_mdp_mixer_update_pipe_map(struct mdss_mdp_ctl *master_ctl,

		int mixer_mux);

int mdss_mdp_wb_set_format(struct msm_fb_data_type *mfd, u32 dst_format);

int mdss_mdp_wb_get_format(struct msm_fb_data_type *mfd,

					struct mdp_mixer_cfg *mixer_cfg);

drivers/video/msm/mdss/mdss_mdp_ctl.c

+1 −1
Original line number Diff line number Diff line
@@ -3667,7 +3667,7 @@ int mdss_mdp_ctl_reset(struct mdss_mdp_ctl *ctl, bool is_recovery) 
 * This function keeps track of the current mixer configuration in the hardware.

 * It's callers responsibility to call with master control.

 */

static void mdss_mdp_mixer_update_pipe_map(struct mdss_mdp_ctl *master_ctl,

void mdss_mdp_mixer_update_pipe_map(struct mdss_mdp_ctl *master_ctl,

		       int mixer_mux)

{

	struct mdss_mdp_mixer *mixer = mdss_mdp_mixer_get(master_ctl,

drivers/video/msm/mdss/mdss_mdp_overlay.c

+5 −0
Original line number Diff line number Diff line
@@ -4690,6 +4690,11 @@ static int mdss_mdp_overlay_off(struct msm_fb_data_type *mfd) 


ctl_stop:

	mutex_lock(&mdp5_data->ov_lock);

	/* set the correct pipe_mapped before ctl_stop */

	mdss_mdp_mixer_update_pipe_map(mdp5_data->ctl,

			MDSS_MDP_MIXER_MUX_LEFT);

	mdss_mdp_mixer_update_pipe_map(mdp5_data->ctl,

			MDSS_MDP_MIXER_MUX_RIGHT);

	rc = mdss_mdp_ctl_stop(mdp5_data->ctl, mfd->panel_power_state);

	if (rc == 0) {

		if (mdss_fb_is_power_off(mfd)) {