Merge "msm: mdss: fix data mismatch errors on rotator" (339c3875) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_ctl.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2860,7 +2860,7 @@ static void mdss_mdp_mixer_setup(struct mdss_mdp_ctl *master_ctl,
		return;

		ctl = mixer->ctl;
		if (!ctl \|\| !ctl->valid_roi)
		if (!ctl)
		return;

		mixer->params_changed = 0;
		@@ -2871,6 +2871,9 @@ static void mdss_mdp_mixer_setup(struct mdss_mdp_ctl *master_ctl,
		return;
		}

		if (!ctl->valid_roi)
		return;

		trace_mdp_mixer_update(mixer->num);
		pr_debug("setup mixer=%d\n", mixer->num);
		screen_state = ctl->force_screen_state;