Merge "Revert "msm: mdss:set brightness to min_bl if brightness is less than min_bl."" (759f5a97) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_fb.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -619,11 +619,11 @@ static void mdss_fb_scale_bl(struct msm_fb_data_type mfd, u32 bl_lvl)
		* scaling fraction (x/1024)
		*/
		temp = (temp * mfd->bl_scale) / 1024;
		}

		/if less than minimum level, use min level/
		else if ((temp < mfd->bl_min_lvl) && (0 != temp))
		if (temp < mfd->bl_min_lvl)
		temp = mfd->bl_min_lvl;

		}
		pr_debug("output = %d", temp);

		(*bl_lvl) = temp;
		@@ -638,9 +638,6 @@ void mdss_fb_set_backlight(struct msm_fb_data_type *mfd, u32 bkl_lvl)

		if (((!mfd->panel_power_on && mfd->dcm_state != DCM_ENTER)
		\|\| !mfd->bl_updated) && !IS_CALIB_MODE_BL(mfd)) {
		if (bkl_lvl < mfd->bl_min_lvl)
		mfd->unset_bl_level = mfd->bl_min_lvl;
		else
		mfd->unset_bl_level = bkl_lvl;
		return;
		} else {