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

Commit 93788a6e 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: indicate splash screen condition explicitly"

parents ac07c939 01f5d4a9

drivers/video/msm/mdss/mdp3_ctrl.c

+6 −2
Original line number Diff line number Diff line
@@ -714,6 +714,7 @@ static int mdp3_ctrl_off(struct msm_fb_data_type *mfd) 
	atomic_set(&mdp3_session->vsync_countdown, 0);

	atomic_set(&mdp3_session->dma_done_cnt, 0);

	mdp3_session->clk_on = 0;

	mdp3_session->in_splash_screen = 0;

off_error:

	mdp3_session->status = 0;

	mdp3_bufq_deinit(&mdp3_session->bufq_out);
@@ -766,6 +767,7 @@ static int mdp3_ctrl_reset_cmd(struct msm_fb_data_type *mfd) 
		mdp3_dma->vsync_enable(mdp3_dma, &vsync_client);



	mdp3_session->first_commit = true;

	mdp3_session->in_splash_screen = 0;



reset_error:

	mutex_unlock(&mdp3_session->lock);
@@ -855,6 +857,7 @@ static int mdp3_ctrl_reset(struct msm_fb_data_type *mfd) 
		mdp3_dma->vsync_enable(mdp3_dma, &vsync_client);



	mdp3_session->first_commit = true;

	mdp3_session->in_splash_screen = 0;



reset_error:

	mutex_unlock(&mdp3_session->lock);
@@ -1020,7 +1023,7 @@ static int mdp3_ctrl_display_commit_kickoff(struct msm_fb_data_type *mfd, 
	}



	panel = mdp3_session->panel;

	if (!mdp3_iommu_is_attached(MDP3_CLIENT_DMA_P)) {

	if (mdp3_session->in_splash_screen) {

		pr_debug("continuous splash screen, IOMMU not attached\n");

		rc = mdp3_ctrl_reset(mfd);

		if (rc) {
@@ -1107,7 +1110,7 @@ static void mdp3_ctrl_pan_display(struct msm_fb_data_type *mfd, 
	if (!mdp3_session || !mdp3_session->dma)

		return;



	if (!mdp3_iommu_is_attached(MDP3_CLIENT_DMA_P)) {

	if (mdp3_session->in_splash_screen) {

		pr_debug("continuous splash screen, IOMMU not attached\n");

		rc = mdp3_ctrl_reset(mfd);

		if (rc) {
@@ -1892,6 +1895,7 @@ int mdp3_ctrl_init(struct msm_fb_data_type *mfd) 


	if (mdp3_get_cont_spash_en()) {

		mdp3_session->clk_on = 1;

		mdp3_session->in_splash_screen = 1;

		mdp3_ctrl_notifier_register(mdp3_session,

			&mdp3_session->mfd->mdp_sync_pt_data.notifier);

	}

drivers/video/msm/mdss/mdp3_ctrl.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ struct mdp3_session_data { 


	int vsync_enabled;

	atomic_t vsync_countdown; /* Used to count down  */

	bool in_splash_screen;

};



int mdp3_ctrl_init(struct msm_fb_data_type *mfd);