On Fri, Apr 17, 2020 at 02:33:12PM +0300, Tomi Valkeinen wrote:
> led_bl_parse_levels() is rather difficult to follow. Rewrite it with a
> more obvious code flow.
... that introduces new behaviour.
There's a couple of new behaviours here but the one that particular
attracted my attention is the disregarding the "default-brightness-level" if
there is no table. That looks like a bug to me.
Please can you add any intended changes of behaviour in the patch
header?
Daniel.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
> ---
> drivers/video/backlight/led_bl.c | 63 ++++++++++++++++----------------
> 1 file changed, 32 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/video/backlight/led_bl.c b/drivers/video/backlight/led_bl.c
> index 021b5edd895c..7b3889035540 100644
> --- a/drivers/video/backlight/led_bl.c
> +++ b/drivers/video/backlight/led_bl.c
> @@ -132,50 +132,51 @@ static int led_bl_parse_levels(struct device *dev,
> int num_levels;
> u32 value;
> int ret;
> + int i;
> + u32 *levels;
>
> if (!node)
> return -ENODEV;
>
> num_levels = of_property_count_u32_elems(node, "brightness-levels");
> - if (num_levels > 1) {
> - int i;
> - unsigned int db;
> - u32 *levels;
> -
> - levels = devm_kzalloc(dev, sizeof(u32) * num_levels,
> - GFP_KERNEL);
> - if (!levels)
> - return -ENOMEM;
> -
> - ret = of_property_read_u32_array(node, "brightness-levels",
> - levels,
> - num_levels);
> - if (ret < 0)
> - return ret;
> -
> - /*
> - * Try to map actual LED brightness to backlight brightness
> - * level
> - */
> - db = priv->default_brightness;
> +
> + if (num_levels < 0)
> + return 0;
> +
> + if (num_levels == 0) {
> + dev_warn(dev, "No brightness-levels defined\n");
> + return -EINVAL;
> + }
> +
> + levels = devm_kzalloc(dev, sizeof(u32) * num_levels,
> + GFP_KERNEL);
> + if (!levels)
> + return -ENOMEM;
> +
> + ret = of_property_read_u32_array(node, "brightness-levels",
> + levels,
> + num_levels);
> + if (ret < 0)
> + return ret;
> +
> + priv->max_brightness = num_levels - 1;
> + priv->levels = levels;
> +
> + ret = of_property_read_u32(node, "default-brightness-level", &value);
> + if (!ret) {
> + priv->default_brightness = min(value, priv->max_brightness);
> + } else {
> + /* Map LED default-brightness to backlight brightness level */
> + unsigned int db = priv->default_brightness;
> +
> for (i = 0 ; i < num_levels; i++) {
> if ((i == 0 || db > levels[i - 1]) && db <= levels[i])
> break;
> }
>
> priv->default_brightness = i < num_levels ? i : 0;
> - priv->max_brightness = num_levels - 1;
> - priv->levels = levels;
> - } else if (num_levels >= 0) {
> - dev_warn(dev, "Not enough levels defined\n");
> }
>
> - ret = of_property_read_u32(node, "default-brightness-level", &value);
> - if (!ret && value <= priv->max_brightness)
> - priv->default_brightness = value;
> - else if (!ret && value > priv->max_brightness)
> - dev_warn(dev, "Invalid default brightness. Ignoring it\n");
> -
> return 0;
> }
>
> --
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
