diff options
| author | Carl Vanderlip <carlv@codeaurora.org> | 2013-10-16 10:02:38 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:22:16 -0700 |
| commit | 0f488c13e382e4e289f13f3ca536a0e08e637bab (patch) | |
| tree | 7fa671ab442e702a8a118bf21bab2d3ecc70b54a | |
| parent | b39e82523fc873c8792550f4ad1e55531a9926cb (diff) | |
Revert "msm: mdss:set brightness to min_bl if brightness is less than min_bl."
Backlight should not be limited to be above a minimum level in the
backlight scale function. Nor should it be limited for all backlight
drivers (should be implemented in the culprit panel's set_backlight func).
This reverts commit 2e5776fdb8acd50ad84752df0c6e0debf42cdf5d
Change-Id: Idcbf26eb3babb2a29964b9c7fb8e95aa31a8c5b8
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index ca8d34ca7bec..073cdf9a9b69 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -615,11 +615,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)) - temp = mfd->bl_min_lvl; + /*if less than minimum level, use min level*/ + if (temp < mfd->bl_min_lvl) + temp = mfd->bl_min_lvl; + } pr_debug("output = %d", temp); (*bl_lvl) = temp; @@ -634,11 +634,8 @@ 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; + mfd->unset_bl_level = bkl_lvl; + return; } else { mfd->unset_bl_level = 0; } |