Skip to contentSkip to conversation

trivial: atmel_lcdfb: add missing error message

PATCH In review Richard Genoud 2 participants 5 messages May 31, 2013

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

PATCH 1/2 trivial: atmel_lcdfb: add missing error message

When a too small framebuffer is given, the atmel_lcdfb_check_var silently fails.
Adding an error message will save some head scratching.

---
 drivers/video/atmel_lcdfb.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/video/atmel_lcdfb.c +4 -1
index 540909d..6e6491f 100644
@@ -461,8 +461,11 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
 	if (info->fix.smem_len) {
 		unsigned int smem_len = (var->xres_virtual * var->yres_virtual
 					 * ((var->bits_per_pixel + 7) / 8));
-		if (smem_len > info->fix.smem_len)
+		if (smem_len > info->fix.smem_len) {
+			dev_err(dev, "Frame buffer is too small (%u) for screen size (need at least %u)\n",
+				info->fix.smem_len, smem_len);
 			return -EINVAL;
+		}
 	}
 
 	/* Saturate vertical and horizontal timings at maximum values */
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/2 atmel_lcdfb: blank the backlight on remove

When removing atmel_lcdfb module, the backlight is unregistered but not blanked. (only for CONFIG_BACKLIGHT_ATMEL_LCDC case).
This can result in the screen going full white depending on how the PWM is wired.

---
 drivers/video/atmel_lcdfb.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/video/atmel_lcdfb.c +6 -1
index 6e6491f..e00318f 100644
@@ -223,8 +223,13 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo)
 
 static void exit_backlight(struct atmel_lcdfb_info *sinfo)
 {
-	if (sinfo->backlight)
+	if (sinfo->backlight) {
+		if (sinfo->backlight->ops) {
+			sinfo->backlight->props.power = FB_BLANK_POWERDOWN;
+			sinfo->backlight->ops->update_status(sinfo->backlight);
+		}
 		backlight_device_unregister(sinfo->backlight);
+	}
 }
 
 #else
Signature · 1 line
1.7.10.4
#2 lore raw

Re: [PATCH 2/2] atmel_lcdfb: blank the backlight on remove

Quoted 15 lines · Richard Genoud

When removing atmel_lcdfb module, the backlight is unregistered but not blanked. (only for CONFIG_BACKLIGHT_ATMEL_LCDC case).
This can result in the screen going full white depending on how the PWM is wired.

---
 drivers/video/atmel_lcdfb.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/video/atmel_lcdfb.c +0 -0
index 6e6491f..e00318f 100644

drivers/video/atmel_lcdfb.c static void init_backlight(struct atmel_lcdfb_info *sinfo) · line 226

Quoted 5 lines
drivers/video/atmel_lcdfb.c +1 -1
@@ -223,8 +223,13 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo)
 
 static void exit_backlight(struct atmel_lcdfb_info *sinfo)
 {
-	if (sinfo->backlight)
+	if (sinfo->backlight) {

if (!sinfo->backlight)

	return;

	other look ok 

if you want ot hte next RC you have 3h to send a v2 before I work off for few days

Best Regards,
J.

#3 lore raw

Re: [PATCH 2/2] atmel_lcdfb: blank the backlight on remove

2013/5/31 Jean-Christophe PLAGNIOL-VILLARD <[email protected]>:

Quoted 17 lines · Richard Genoud
Quoted 16 lines

When removing atmel_lcdfb module, the backlight is unregistered but not blanked. (only for CONFIG_BACKLIGHT_ATMEL_LCDC case).
This can result in the screen going full white depending on how the PWM is wired.

---
 drivers/video/atmel_lcdfb.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/video/atmel_lcdfb.c +0 -0
index 6e6491f..e00318f 100644
@@ -223,8 +223,13 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo)
 
Quoted 7 lines

drivers/video/atmel_lcdfb.c static void init_backlight(struct atmel_lcdfb_info *sinfo) · line 226

Quoted 4 lines
drivers/video/atmel_lcdfb.c +1 -1
 static void exit_backlight(struct atmel_lcdfb_info *sinfo)
 {
-     if (sinfo->backlight)
+     if (sinfo->backlight) {

if (!sinfo->backlight)

        return;

Well, I usually prefer to have a single exit point (when it doesn't make the code go beyond the 80chars limit).

but if you prefer something like:

if (!sinfo->backlight)

	return;
if (sinfo->backlight->ops) {
	sinfo->backlight->props.power = FB_BLANK_POWERDOWN;
	sinfo->backlight->ops->update_status(sinfo->backlight);
}

backlight_device_unregister(sinfo->backlight);

I'll send the modified patch.

Quoted 4 lines

other look ok

if you want ot hte next RC you have 3h to send a v2 before I work off for few days

ok, bonnes vacances !

Quoted 3 lines

Best Regards,
J.

#4 lore raw

PATCH v2 2/2 atmel_lcdfb: blank the backlight on remove

When removing atmel_lcdfb module, the backlight is unregistered but not blanked. (only for CONFIG_BACKLIGHT_ATMEL_LCDC case).
This can result in the screen going full white depending on how the PWM is wired.

---
 drivers/video/atmel_lcdfb.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/video/atmel_lcdfb.c +8 -2
index 6e6491f..effdb37 100644
@@ -223,8 +223,14 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo)
 
 static void exit_backlight(struct atmel_lcdfb_info *sinfo)
 {
-	if (sinfo->backlight)
-		backlight_device_unregister(sinfo->backlight);
+	if (!sinfo->backlight)
+		return;
+
+	if (sinfo->backlight->ops) {
+		sinfo->backlight->props.power = FB_BLANK_POWERDOWN;
+		sinfo->backlight->ops->update_status(sinfo->backlight);
+	}
+	backlight_device_unregister(sinfo->backlight);
 }
 
 #else
Signature · 1 line
1.7.10.4