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

Commit b28ae958 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: Add missing BL lock around BL-related info"

parents df2fc7ac 2b5c6b3a

drivers/video/msm/mdss/mdss_fb.c

+4 −2
Original line number Diff line number Diff line
@@ -977,17 +977,17 @@ void mdss_fb_update_backlight(struct msm_fb_data_type *mfd) 
{

	struct mdss_panel_data *pdata;



	mutex_lock(&mfd->bl_lock);

	if (mfd->unset_bl_level && !mfd->bl_updated) {

		pdata = dev_get_platdata(&mfd->pdev->dev);

		if ((pdata) && (pdata->set_backlight)) {

			mutex_lock(&mfd->bl_lock);

			mfd->bl_level = mfd->unset_bl_level;

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

			mfd->bl_level_old = mfd->unset_bl_level;

			mutex_unlock(&mfd->bl_lock);

			mfd->bl_updated = 1;

		}

	}

	mutex_unlock(&mfd->bl_lock);

}



static int mdss_fb_blank_sub(int blank_mode, struct fb_info *info,
@@ -1042,7 +1042,9 @@ static int mdss_fb_blank_sub(int blank_mode, struct fb_info *info, 
			mfd->op_enable = false;

			curr_pwr_state = mfd->panel_power_on;

			mfd->panel_power_on = false;

			mutex_lock(&mfd->bl_lock);

			mfd->bl_updated = 0;

			mutex_unlock(&mfd->bl_lock);



			ret = mfd->mdp.off_fnc(mfd);

			if (ret)

drivers/video/msm/mdss/mdss_mdp_splash_logo.c

+1 −1
Original line number Diff line number Diff line
@@ -511,8 +511,8 @@ static int mdss_mdp_splash_thread(void *data) 
	}

	unlock_fb_info(mfd->fbi);



	mfd->bl_updated = true;

	mutex_lock(&mfd->bl_lock);

	mfd->bl_updated = true;

	mdss_fb_set_backlight(mfd, mfd->panel_info->bl_max >> 1);

	mutex_unlock(&mfd->bl_lock);