Merge "msm: mdss: Fix clk warnings for esc clk with dual-dsi panels" (74508030) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_ctl.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -627,8 +627,21 @@ int mdss_mdp_wb_mixer_destroy(struct mdss_mdp_mixer *mixer)
		return 0;
		}

		static inline struct mdss_mdp_ctl *mdss_mdp_get_split_ctl(
		struct mdss_mdp_ctl *ctl)
		{
		if (ctl && ctl->mixer_right && (ctl->mixer_right->ctl != ctl))
		return ctl->mixer_right->ctl;

		return NULL;
		}

		int mdss_mdp_ctl_splash_finish(struct mdss_mdp_ctl *ctl, bool handoff)
		{
		struct mdss_mdp_ctl *sctl = mdss_mdp_get_split_ctl(ctl);
		if (sctl)
		sctl->panel_data->panel_info.cont_splash_enabled = 0;

		switch (ctl->panel_data->panel_info.type) {
		case MIPI_VIDEO_PANEL:
		case EDP_PANEL:
		@@ -653,15 +666,6 @@ static inline int mdss_mdp_set_split_ctl(struct mdss_mdp_ctl *ctl,
		return 0;
		}

		static inline struct mdss_mdp_ctl *mdss_mdp_get_split_ctl(
		struct mdss_mdp_ctl *ctl)
		{
		if (ctl && ctl->mixer_right && (ctl->mixer_right->ctl != ctl))
		return ctl->mixer_right->ctl;

		return NULL;
		}

		static int mdss_mdp_ctl_fbc_enable(int enable,
		struct mdss_mdp_mixer mixer, struct mdss_panel_info pdata)
		{