Skip to contentSkip to conversation

drm/panel: sony-acx565akm: Use backlight helpers

PATCH Applied Stephen Kitt 3 participants 3 messages Jun 16, 2022 – Jun 24, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 3/3 drm/panel: sony-acx565akm: Use backlight helpers

Instead of retrieving the backlight brightness in struct backlight_properties manually, and then checking whether the backlight should be on at all, use backlight_get_brightness() which does all this and insulates this from future changes.

Instead of manually checking the power state in struct backlight_properties, use backlight_is_blank().

While we're at it, drop .fb_blank from the initialisation function; it is deprecated, and this helps make progress towards enabling its removal. This change makes no functional difference since FB_BLANK_UNBLANK is the default value.

Cc Thierry Reding <[email protected]>
Cc Sam Ravnborg <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>

---
Changes since v1: removed the last remaining .fb_blank reference

---
 drivers/gpu/drm/panel/panel-sony-acx565akm.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/panel/panel-sony-acx565akm.c +2 -10
index 0d7541a33f87..3d6a286056a0 100644
@@ -298,13 +298,7 @@ static void acx565akm_set_brightness(struct acx565akm_panel *lcd, int level)
 static int acx565akm_bl_update_status_locked(struct backlight_device *dev)
 {
 	struct acx565akm_panel *lcd = dev_get_drvdata(&dev->dev);
-	int level;
-
-	if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
-	    dev->props.power == FB_BLANK_UNBLANK)
-		level = dev->props.brightness;
-	else
-		level = 0;
+	int level = backlight_get_brightness(dev);
 
 	acx565akm_set_brightness(lcd, level);
 
@@ -330,8 +324,7 @@ static int acx565akm_bl_get_intensity(struct backlight_device *dev)
 
 	mutex_lock(&lcd->mutex);
 
-	if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
-	    dev->props.power == FB_BLANK_UNBLANK)
+	if (!backlight_is_blank(dev))
 		intensity = acx565akm_get_actual_brightness(lcd);
 	else
 		intensity = 0;
@@ -349,7 +342,6 @@ static const struct backlight_ops acx565akm_bl_ops = {
 static int acx565akm_backlight_init(struct acx565akm_panel *lcd)
 {
 	struct backlight_properties props = {
-		.fb_blank = FB_BLANK_UNBLANK,
 		.power = FB_BLANK_UNBLANK,
 		.type = BACKLIGHT_RAW,
 	};
Signature · 1 line
2.30.2
Reviewed-by on v2 3/3
#1 lore raw

Hi,

Quoted 19 lines · Stephen Kitt

Instead of retrieving the backlight brightness in struct backlight_properties manually, and then checking whether the backlight should be on at all, use backlight_get_brightness() which does all this and insulates this from future changes.

Instead of manually checking the power state in struct backlight_properties, use backlight_is_blank().

While we're at it, drop .fb_blank from the initialisation function; it is deprecated, and this helps make progress towards enabling its removal. This change makes no functional difference since FB_BLANK_UNBLANK is the default value.

Cc Thierry Reding <[email protected]>
Cc Sam Ravnborg <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
Quoted 3 lines

---
Changes since v1: removed the last remaining .fb_blank reference
---

-- Sebastian

Quoted 43 lines
 drivers/gpu/drm/panel/panel-sony-acx565akm.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/panel/panel-sony-acx565akm.c +2 -10
index 0d7541a33f87..3d6a286056a0 100644
@@ -298,13 +298,7 @@ static void acx565akm_set_brightness(struct acx565akm_panel *lcd, int level)
 static int acx565akm_bl_update_status_locked(struct backlight_device *dev)
 {
 	struct acx565akm_panel *lcd = dev_get_drvdata(&dev->dev);
-	int level;
-
-	if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
-	    dev->props.power == FB_BLANK_UNBLANK)
-		level = dev->props.brightness;
-	else
-		level = 0;
+	int level = backlight_get_brightness(dev);
 
 	acx565akm_set_brightness(lcd, level);
 
@@ -330,8 +324,7 @@ static int acx565akm_bl_get_intensity(struct backlight_device *dev)
 
 	mutex_lock(&lcd->mutex);
 
-	if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
-	    dev->props.power == FB_BLANK_UNBLANK)
+	if (!backlight_is_blank(dev))
 		intensity = acx565akm_get_actual_brightness(lcd);
 	else
 		intensity = 0;
@@ -349,7 +342,6 @@ static const struct backlight_ops acx565akm_bl_ops = {
 static int acx565akm_backlight_init(struct acx565akm_panel *lcd)
 {
 	struct backlight_properties props = {
-		.fb_blank = FB_BLANK_UNBLANK,
 		.power = FB_BLANK_UNBLANK,
 		.type = BACKLIGHT_RAW,
 	};
Signature · 1 line
2.30.2
Applied
#2 lore raw
In reply to Stephen Kitt
Quoted 13 lines · Stephen Kitt

Instead of retrieving the backlight brightness in struct backlight_properties manually, and then checking whether the backlight should be on at all, use backlight_get_brightness() which does all this and insulates this from future changes.

Instead of manually checking the power state in struct backlight_properties, use backlight_is_blank().

While we're at it, drop .fb_blank from the initialisation function; it is deprecated, and this helps make progress towards enabling its removal. This change makes no functional difference since FB_BLANK_UNBLANK is the default value.

Quoted 6 lines
Cc Thierry Reding <[email protected]>
Cc Sam Ravnborg <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>

Thanks, applied to drm-misc (drm-misc-next)

Sam