pwm-backlight: handle BL_CORE_FBBLANK state

PATCH Applied Alexandre Courbot 2 participants 2 messages Jan 30, 2013

Subsystems (2)

Framebuffer layer Backlight class/subsystem

lore

Share & tools

lore

Alexandre Courbot

author

2013-01-30 06:19 UTC #0 lore raw

PATCH 1/1 pwm-backlight: handle BL_CORE_FBBLANK state

According to include/linux/backlight.h, the fb_blank field is to be removed and blank status should preferably be set by setting the BL_CORE_FBBLANK bit of the state field. This patch ensures this condition is also taken into account when updating the backlight state.

Signed-off-by Alexandre Courbot <[email protected]>

---
 drivers/video/backlight/pwm_bl.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

drivers/video/backlight/pwm_bl.c +3 -4

index 069983c..4af6d13 100644
@@ -41,10 +41,9 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
 	int brightness = bl->props.brightness;
 	int max = bl->props.max_brightness;
 
-	if (bl->props.power != FB_BLANK_UNBLANK)
-		brightness = 0;
-
-	if (bl->props.fb_blank != FB_BLANK_UNBLANK)
+	if (bl->props.power != FB_BLANK_UNBLANK ||
+	    bl->props.fb_blank != FB_BLANK_UNBLANK ||
+	    bl->props.state & BL_CORE_FBBLANK)
 		brightness = 0;
 
 	if (pb->notify)

Signature · 1 line

1.8.1.2

Thierry Reding

Applied

2013-01-30 07:58 UTC #1 lore raw

Quoted 9 lines · Alexandre Courbot

According to include/linux/backlight.h, the fb_blank field is to be removed and blank status should preferably be set by setting the BL_CORE_FBBLANK bit of the state field. This patch ensures this condition is also taken into account when updating the backlight state.
Signed-off-by Alexandre Courbot <[email protected]>
---
 drivers/video/backlight/pwm_bl.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Applied, thanks.

Thierry