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

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

Merge "video: fbdev: msm: store backlight level sent during handoff"

parents a47ee18f 727b9a3e

drivers/video/fbdev/msm/mdp3_ctrl.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -1831,8 +1831,13 @@ static void mdp3_ctrl_pan_display(struct msm_fb_data_type *mfd) 




	mdp3_session->vsync_before_commit = 0;

	mdp3_session->vsync_before_commit = 0;

	if (!splash_done || mdp3_session->esd_recovery == true) {

	if (!splash_done || mdp3_session->esd_recovery == true) {

		if (panel && panel->set_backlight)

		if (panel && panel->set_backlight) {

			panel->set_backlight(panel, panel->panel_info.bl_max);

			if (mfd->bl_level > 0)

				panel->set_backlight(panel, mfd->bl_level);

			else

				panel->set_backlight(panel,

						panel->panel_info.bl_max);

		}

		splash_done = true;

		splash_done = true;

		mdp3_session->esd_recovery = false;

		mdp3_session->esd_recovery = false;

	}

	}

drivers/video/fbdev/msm/mdss_fb.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1914,6 +1914,9 @@ static int mdss_fb_blank_blank(struct msm_fb_data_type *mfd, 
		if (mfd->disp_thread)

		if (mfd->disp_thread)

			mdss_fb_stop_disp_thread(mfd);

			mdss_fb_stop_disp_thread(mfd);

		mutex_lock(&mfd->bl_lock);

		mutex_lock(&mfd->bl_lock);

		if (mfd->unset_bl_level != U32_MAX)

			current_bl = mfd->unset_bl_level;

		else

			current_bl = mfd->bl_level;

			current_bl = mfd->bl_level;

		mfd->allow_bl_update = true;

		mfd->allow_bl_update = true;

		mdss_fb_set_backlight(mfd, 0);

		mdss_fb_set_backlight(mfd, 0);