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

Commit 76fe8353 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mdss: mdp: Do not delay splash cleanup for split dsi"

parents 9c4d89ce 7c00cf53

drivers/video/msm/mdss/mdss.h

+1 −0
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ struct mdss_data_type { 
	struct mdss_scaler_block *scaler_off;



	u32 splash_intf_sel;

	u32 splash_split_disp;

};



extern struct mdss_data_type *mdss_res;

drivers/video/msm/mdss/mdss_mdp.c

+1 −0
Original line number Diff line number Diff line
@@ -2731,6 +2731,7 @@ static int mdss_mdp_probe(struct platform_device *pdev) 
	split_display = readl_relaxed(mdata->mdp_base +

		MDSS_MDP_REG_SPLIT_DISPLAY_EN);

	mdata->splash_intf_sel = intf_sel;

	mdata->splash_split_disp = split_display;



	if (intf_sel != 0) {

		for (i = 0; i < 4; i++)

drivers/video/msm/mdss/mdss_mdp_splash_logo.c

+6 −4
Original line number Diff line number Diff line
@@ -310,10 +310,11 @@ int mdss_mdp_splash_cleanup(struct msm_fb_data_type *mfd, 


	mdss_mdp_ctl_splash_finish(ctl, mdp5_data->handoff);



	/* If DSI-1 interface is enabled by LK, free cont_splash_mem for dsi

	 * during the cleanup for DSI-1.

	/* If DSI-1 interface is enabled by LK & split dsi is not enabled,

	 * free cont_splash_mem for dsi during the cleanup for DSI-1.

	 */

	if ((mdata->splash_intf_sel & MDSS_MDP_INTF_DSI1_SEL) &&

	if (!mdata->splash_split_disp &&

		(mdata->splash_intf_sel & MDSS_MDP_INTF_DSI1_SEL) &&

		mfd->panel_info->pdest == DISPLAY_1) {

		pr_debug("delay cleanup for display %d\n",

						mfd->panel_info->pdest);
@@ -324,7 +325,8 @@ int mdss_mdp_splash_cleanup(struct msm_fb_data_type *mfd, 
		goto end;

	}



	if ((mdata->splash_intf_sel & MDSS_MDP_INTF_DSI1_SEL) &&

	if (!mdata->splash_split_disp &&

		(mdata->splash_intf_sel & MDSS_MDP_INTF_DSI1_SEL) &&

		mfd->panel_info->pdest == DISPLAY_2 &&

		!mfd->splash_info.iommu_dynamic_attached) {

		pr_debug("free splash mem for display %d\n",