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

Commit df565364 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: Correct set backlight call during unblank"

parents fba1d790 5a999538

drivers/video/msm/mdss/mdss_fb.c

+1 −3
Original line number Diff line number Diff line
@@ -629,7 +629,6 @@ static int mdss_fb_probe(struct platform_device *pdev) 


	mfd->ext_ad_ctrl = -1;

	mfd->bl_level = 0;

	mfd->bl_level_prev_scaled = 0;

	mfd->bl_scale = 1024;

	mfd->bl_min_lvl = 30;

	mfd->fb_imgType = MDP_RGBA_8888;
@@ -972,7 +971,6 @@ void mdss_fb_set_backlight(struct msm_fb_data_type *mfd, u32 bkl_lvl) 
				pr_err("Failed to attenuate BL\n");

		}



		mfd->bl_level_prev_scaled = mfd->bl_level_scaled;

		if (!IS_CALIB_MODE_BL(mfd))

			mdss_fb_scale_bl(mfd, &temp);

		/*
@@ -1066,7 +1064,7 @@ static int mdss_fb_blank_sub(int blank_mode, struct fb_info *info, 
		mutex_lock(&mfd->bl_lock);

		if (!mfd->bl_updated) {

			mfd->bl_updated = 1;

			mdss_fb_set_backlight(mfd, mfd->bl_level_prev_scaled);

			mdss_fb_set_backlight(mfd, mfd->unset_bl_level);

		}

		mutex_unlock(&mfd->bl_lock);

		break;

drivers/video/msm/mdss/mdss_fb.h

+0 −1
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ struct msm_fb_data_type { 
	u32 unset_bl_level;

	u32 bl_updated;

	u32 bl_level_scaled;

	u32 bl_level_prev_scaled;

	struct mutex bl_lock;



	struct platform_device *pdev;