evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: Add support to read BL level for userspace"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-03 06:24:41 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7cb9e91f79
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/video/fbdev/msm/mdss_fb.c
View file

@ -301,6 +301,7 @@ static void mdss_fb_set_bl_brightness(struct led_classdev *led_cdev,
mdss_fb_set_backlight(mfd, bl_lvl); mdss_fb_set_backlight(mfd, bl_lvl);
mutex_unlock(&mfd->bl_lock); mutex_unlock(&mfd->bl_lock);
} }
mfd->bl_level_usr = bl_lvl;
} }
static enum led_brightness mdss_fb_get_bl_brightness( static enum led_brightness mdss_fb_get_bl_brightness(
@ -309,7 +310,7 @@ static enum led_brightness mdss_fb_get_bl_brightness(
struct msm_fb_data_type *mfd = dev_get_drvdata(led_cdev->dev->parent); struct msm_fb_data_type *mfd = dev_get_drvdata(led_cdev->dev->parent);
enum led_brightness value; enum led_brightness value;
MDSS_BL_TO_BRIGHT(value, mfd->bl_level, mfd->panel_info->bl_max, MDSS_BL_TO_BRIGHT(value, mfd->bl_level_usr, mfd->panel_info->bl_max,
mfd->panel_info->brightness_max); mfd->panel_info->brightness_max);
return value; return value;
@ -1276,6 +1277,7 @@ static int mdss_fb_probe(struct platform_device *pdev)
mfd->calib_mode_bl = 0; mfd->calib_mode_bl = 0;
mfd->unset_bl_level = U32_MAX; mfd->unset_bl_level = U32_MAX;
mfd->bl_extn_level = -1; mfd->bl_extn_level = -1;
mfd->bl_level_usr = backlight_led.brightness;
mfd->pdev = pdev; mfd->pdev = pdev;

1
drivers/video/fbdev/msm/mdss_fb.h
View file

@ -314,6 +314,7 @@ struct msm_fb_data_type {
u32 unset_bl_level; u32 unset_bl_level;
bool allow_bl_update; bool allow_bl_update;
u32 bl_level_scaled; u32 bl_level_scaled;
u32 bl_level_usr;
struct mutex bl_lock; struct mutex bl_lock;
struct mutex mdss_sysfs_lock; struct mutex mdss_sysfs_lock;
bool ipc_resume; bool ipc_resume;

1
drivers/video/fbdev/msm/mdss_mdp_ctl.c
View file

@ -6061,6 +6061,7 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl *ctl, void *arg,
mutex_lock(&ctl->mfd->bl_lock); mutex_lock(&ctl->mfd->bl_lock);
mdss_fb_set_backlight(ctl->mfd, mdss_fb_set_backlight(ctl->mfd,
ctl->mfd->bl_extn_level); ctl->mfd->bl_extn_level);
ctl->mfd->bl_level_usr = ctl->mfd->bl_extn_level;
mutex_unlock(&ctl->mfd->bl_lock); mutex_unlock(&ctl->mfd->bl_lock);
} }
} }