* [PATCH] backlight: initialize struct backlight_properties properly
@ 2012-05-21 7:24 Corentin Chary
2012-05-22 0:07 ` Jingoo Han
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Corentin Chary @ 2012-05-21 7:24 UTC (permalink / raw)
To: Richard Purdie
Cc: Corentin Chary, Keith Packard, David Airlie, Matthew Garrett,
Florian Tobias Schandinat, Mark Brown, Tomi Valkeinen,
Mathieu Poirier, Dave Airlie, Arnd Bergmann, Lars-Peter Clausen,
Axel Lin, dri-devel, linux-kernel, platform-driver-x86,
linux-fbdev, patches, linux-omap
In all these files, the .power field was never correctly initialized.
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
---
drivers/gpu/drm/i915/intel_panel.c | 1 +
drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 +
drivers/platform/x86/toshiba_acpi.c | 1 +
drivers/video/backlight/da903x_bl.c | 1 +
drivers/video/backlight/pcf50633-backlight.c | 1 +
drivers/video/backlight/wm831x_bl.c | 1 +
drivers/video/omap2/displays/panel-acx565akm.c | 1 +
7 files changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 48177ec..ec4a1e0 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -342,6 +342,7 @@ int intel_panel_setup_backlight(struct drm_device *dev)
else
return -ENODEV;
+ memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW;
props.max_brightness = intel_panel_get_max_backlight(dev);
dev_priv->backlight diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index 42db254..a0c8222 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -369,6 +369,7 @@ void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder,
goto error;
}
+ memset(&props, 0, sizeof(props));
props.max_brightness = MAX_RADEON_LEVEL;
props.type = BACKLIGHT_RAW;
bd = backlight_device_register("radeon_bl", &drm_connector->kdev,
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index bde32de..d680bb2 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1095,6 +1095,7 @@ static int __devinit toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev)
ret = get_tr_backlight_status(dev, &enabled);
dev->tr_backlight_supported = !ret;
+ memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_PLATFORM;
props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 30e1968..573c7ec 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -136,6 +136,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)
da903x_write(data->da903x_dev, DA9034_WLED_CONTROL2,
DA9034_WLED_ISET(pdata->output_current));
+ memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW;
props.max_brightness = max_brightness;
bl = backlight_device_register(pdev->name, data->da903x_dev, data,
diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c
index c65853c..c092159 100644
--- a/drivers/video/backlight/pcf50633-backlight.c
+++ b/drivers/video/backlight/pcf50633-backlight.c
@@ -111,6 +111,7 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev)
if (!pcf_bl)
return -ENOMEM;
+ memset(&bl_props, 0, sizeof(bl_props));
bl_props.type = BACKLIGHT_RAW;
bl_props.max_brightness = 0x3f;
bl_props.power = FB_BLANK_UNBLANK;
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index 5d365de..9e5517a 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -194,6 +194,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
data->current_brightness = 0;
data->isink_reg = isink_reg;
+ memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW;
props.max_brightness = max_isel;
bl = backlight_device_register("wm831x", &pdev->dev, data,
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
index d26f37a..74e7cf0 100644
--- a/drivers/video/omap2/displays/panel-acx565akm.c
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -532,6 +532,7 @@ static int acx_panel_probe(struct omap_dss_device *dssdev)
/*------- Backlight control --------*/
+ memset(&props, 0, sizeof(props));
props.fb_blank = FB_BLANK_UNBLANK;
props.power = FB_BLANK_UNBLANK;
props.type = BACKLIGHT_RAW;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] backlight: initialize struct backlight_properties properly
2012-05-21 7:24 [PATCH] backlight: initialize struct backlight_properties properly Corentin Chary
@ 2012-05-22 0:07 ` Jingoo Han
2012-05-22 9:25 ` Dave Airlie
2012-05-22 20:59 ` Andrew Morton
2 siblings, 0 replies; 4+ messages in thread
From: Jingoo Han @ 2012-05-22 0:07 UTC (permalink / raw)
To: 'Corentin Chary', 'Richard Purdie',
'Andrew Morton'
Cc: 'Keith Packard', 'David Airlie',
'Matthew Garrett', 'Florian Tobias Schandinat',
'Mark Brown', 'Tomi Valkeinen',
'Mathieu Poirier', 'Dave Airlie',
'Arnd Bergmann', 'Lars-Peter Clausen',
'Axel Lin', dri-devel, linux-kernel, platform-driver-x86,
linux-fbdev, patches, linux-omap, 'Jingoo Han'
On Mon, May 21, 2012 at 04:25 PM +0000, Corentin Chary wrote:
>
> In all these files, the .power field was never correctly initialized.
>
> Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
It looks good.
Best regards,
Jingoo Han
> ---
> drivers/gpu/drm/i915/intel_panel.c | 1 +
> drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 +
> drivers/platform/x86/toshiba_acpi.c | 1 +
> drivers/video/backlight/da903x_bl.c | 1 +
> drivers/video/backlight/pcf50633-backlight.c | 1 +
> drivers/video/backlight/wm831x_bl.c | 1 +
> drivers/video/omap2/displays/panel-acx565akm.c | 1 +
> 7 files changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index 48177ec..ec4a1e0 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -342,6 +342,7 @@ int intel_panel_setup_backlight(struct drm_device *dev)
> else
> return -ENODEV;
>
> + memset(&props, 0, sizeof(props));
> props.type = BACKLIGHT_RAW;
> props.max_brightness = intel_panel_get_max_backlight(dev);
> dev_priv->backlight > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
> b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
> index 42db254..a0c8222 100644
> --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
> +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
> @@ -369,6 +369,7 @@ void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder,
> goto error;
> }
>
> + memset(&props, 0, sizeof(props));
> props.max_brightness = MAX_RADEON_LEVEL;
> props.type = BACKLIGHT_RAW;
> bd = backlight_device_register("radeon_bl", &drm_connector->kdev,
> diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
> index bde32de..d680bb2 100644
> --- a/drivers/platform/x86/toshiba_acpi.c
> +++ b/drivers/platform/x86/toshiba_acpi.c
> @@ -1095,6 +1095,7 @@ static int __devinit toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev)
> ret = get_tr_backlight_status(dev, &enabled);
> dev->tr_backlight_supported = !ret;
>
> + memset(&props, 0, sizeof(props));
> props.type = BACKLIGHT_PLATFORM;
> props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
>
> diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
> index 30e1968..573c7ec 100644
> --- a/drivers/video/backlight/da903x_bl.c
> +++ b/drivers/video/backlight/da903x_bl.c
> @@ -136,6 +136,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)
> da903x_write(data->da903x_dev, DA9034_WLED_CONTROL2,
> DA9034_WLED_ISET(pdata->output_current));
>
> + memset(&props, 0, sizeof(props));
> props.type = BACKLIGHT_RAW;
> props.max_brightness = max_brightness;
> bl = backlight_device_register(pdev->name, data->da903x_dev, data,
> diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c
> index c65853c..c092159 100644
> --- a/drivers/video/backlight/pcf50633-backlight.c
> +++ b/drivers/video/backlight/pcf50633-backlight.c
> @@ -111,6 +111,7 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev)
> if (!pcf_bl)
> return -ENOMEM;
>
> + memset(&bl_props, 0, sizeof(bl_props));
> bl_props.type = BACKLIGHT_RAW;
> bl_props.max_brightness = 0x3f;
> bl_props.power = FB_BLANK_UNBLANK;
> diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
> index 5d365de..9e5517a 100644
> --- a/drivers/video/backlight/wm831x_bl.c
> +++ b/drivers/video/backlight/wm831x_bl.c
> @@ -194,6 +194,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
> data->current_brightness = 0;
> data->isink_reg = isink_reg;
>
> + memset(&props, 0, sizeof(props));
> props.type = BACKLIGHT_RAW;
> props.max_brightness = max_isel;
> bl = backlight_device_register("wm831x", &pdev->dev, data,
> diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-
> acx565akm.c
> index d26f37a..74e7cf0 100644
> --- a/drivers/video/omap2/displays/panel-acx565akm.c
> +++ b/drivers/video/omap2/displays/panel-acx565akm.c
> @@ -532,6 +532,7 @@ static int acx_panel_probe(struct omap_dss_device *dssdev)
>
> /*------- Backlight control --------*/
>
> + memset(&props, 0, sizeof(props));
> props.fb_blank = FB_BLANK_UNBLANK;
> props.power = FB_BLANK_UNBLANK;
> props.type = BACKLIGHT_RAW;
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] backlight: initialize struct backlight_properties properly
2012-05-21 7:24 [PATCH] backlight: initialize struct backlight_properties properly Corentin Chary
2012-05-22 0:07 ` Jingoo Han
@ 2012-05-22 9:25 ` Dave Airlie
2012-05-22 20:59 ` Andrew Morton
2 siblings, 0 replies; 4+ messages in thread
From: Dave Airlie @ 2012-05-22 9:25 UTC (permalink / raw)
To: Corentin Chary
Cc: Richard Purdie, Keith Packard, David Airlie, Matthew Garrett,
Florian Tobias Schandinat, Mark Brown, Tomi Valkeinen,
Mathieu Poirier, Dave Airlie, Arnd Bergmann, Lars-Peter Clausen,
Axel Lin, dri-devel, linux-kernel, platform-driver-x86,
linux-fbdev, patches, linux-omap
On Mon, May 21, 2012 at 8:24 AM, Corentin Chary
<corentin.chary@gmail.com> wrote:
> In all these files, the .power field was never correctly initialized.
>
> Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
> ---
> drivers/gpu/drm/i915/intel_panel.c | 1 +
> drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 +
I've taken these two hunks into drm-next.
Dave.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] backlight: initialize struct backlight_properties properly
2012-05-21 7:24 [PATCH] backlight: initialize struct backlight_properties properly Corentin Chary
2012-05-22 0:07 ` Jingoo Han
2012-05-22 9:25 ` Dave Airlie
@ 2012-05-22 20:59 ` Andrew Morton
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Morton @ 2012-05-22 20:59 UTC (permalink / raw)
To: Corentin Chary
Cc: Arnd Bergmann, Mathieu Poirier, Tobias Schandinat, Mark Brown,
linux-kernel, dri-devel, platform-driver-x86, patches, Florian,
Dave, Richard Purdie, linux-fbdev, Lars-Peter, Airlie, Axel Lin,
linux-omap, Matthew Garrett
On Mon, 21 May 2012 09:24:35 +0200
Corentin Chary <corentin.chary@gmail.com> wrote:
> In all these files, the .power field was never correctly initialized.
>
> ...
>
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -342,6 +342,7 @@ int intel_panel_setup_backlight(struct drm_device *dev)
> else
> return -ENODEV;
>
> + memset(&props, 0, sizeof(props));
This code is all still quite fragile. What happens if we add a new
field to backlight_properties? We need to go edit a zillion drivers?
There are two ways of fixing this:
a) write and use
void backlight_properties_init(struct backlight_properties *props,
int type, int max_brightness, etc);
or
b) edit all sites to do
struct backlight_properties bl_props = {
.type = BACKLIGHT_RAW,
.max_brighness = intel_panel_get_max_backlight(dev),
.power = FB_BLANK_UNBLANK,
};
they're largely equivalent - the struct will be zeroed out and
then certain fields will be initialised. a) is a bit better because
some future field may not want the all-zeroes pattern (eg, a spinlock).
But they're both better than what we have now!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-22 20:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-21 7:24 [PATCH] backlight: initialize struct backlight_properties properly Corentin Chary
2012-05-22 0:07 ` Jingoo Han
2012-05-22 9:25 ` Dave Airlie
2012-05-22 20:59 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).