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

Commit 7b1283eb authored by Ujwal Patel's avatar Ujwal Patel
Browse files

msm: mdss: fix pipe programming with dual mixer single DSI CMD mode 



In command mode panels, ROIs are manipulated differently based on
multiple factors like source split enabled or not, actual ROI, single
layer mixer, dual layer mixer, single DSI or Dual DSI. Current
implementation doesn't handle dual mixer single DSI configuration
correctly which results in pipeline hang when scaling is enabled. Fix
this by adding a check about this configuration.

Change-Id: Ie4a96948a280450c8f1f0638a55aa06f26063c38
Signed-off-by: default avatarUjwal Patel <ujwalp@codeaurora.org>
Signed-off-by: default avatarIngrid Gallardo <ingridg@codeaurora.org>
parent 64c8a021

drivers/video/msm/mdss/mdss_mdp_pipe.c

+14 −6
Original line number Diff line number Diff line
@@ -1709,18 +1709,26 @@ static int mdss_mdp_image_setup(struct mdss_mdp_pipe *pipe, 


		struct mdss_rect ctl_roi = pipe->mixer_left->ctl->roi;

		bool is_right_mixer = pipe->mixer_left->is_right_mixer;

		/* sctl can be NULL, check validity before use */

		struct mdss_mdp_ctl *sctl =

			mdss_mdp_get_split_ctl(pipe->mixer_left->ctl);

		/* main_ctl can be NULL, check validity before use */

		struct mdss_mdp_ctl *main_ctl =

			mdss_mdp_get_main_ctl(pipe->mixer_left->ctl);



		/* adjust roi or dst_x before crop is applied */

		if (pipe->src_split_req && sctl)

			ctl_roi.w += sctl->roi.w;

		else if (mdata->has_src_split && is_right_mixer && main_ctl)

		if (pipe->src_split_req) {

			int r_roi_w = ctl_roi.w;

			struct mdss_mdp_ctl *sctl;



			if (pipe->mfd->split_mode == MDP_DUAL_LM_DUAL_DISPLAY) {

				sctl = mdss_mdp_get_split_ctl(

						pipe->mixer_left->ctl);

				if (sctl)

					r_roi_w = sctl->roi.w;

			}



			ctl_roi.w += r_roi_w;

		} else if (mdata->has_src_split && is_right_mixer && main_ctl) {

			dst.x -= main_ctl->mixer_left->width;

		}



		mdss_mdp_crop_rect(&src, &dst, &ctl_roi);