From: David Heidelberg <[email protected]> Since the previous change wled_probe() seeds wled->brightness from MOD_EN, but with default-brightness rather than the level the hardware is actually driving, so a backlight left lit by the bootloader still visibly steps on the first update, and actual_brightness reports the last value written rather than what the panel shows.
Add wled_read_brightness(), which returns 0 when MOD_EN is clear and otherwise reads the brightness register the matching wledN_set_brightness() writes: the first enabled string on WLED3 and WLED4, the selected modulator on WLED5. Use it to seed both wled->brightness and the initial backlight property, and expose it as backlight_ops.get_brightness so that actual_brightness reflects the hardware too. A module that is enabled with the brightness registers at zero, which wled4_setup() and wled_auto_string_detection() can leave behind on a cold boot, now reads back as off. The OVP interrupt is then armed by the first brightness update rather than from probe, which is what happens on every other board where the module starts out disabled. Suggested-by: Konrad Dybcio <[email protected]> Assisted-by: LLM Signed-off-by: David Heidelberg <[email protected]> --- drivers/video/backlight/qcom-wled.c | 74 +++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 11 deletions(-) diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c index 43e9f6f755582..1acb3ee86878f 100644 --- a/drivers/video/backlight/qcom-wled.c +++ b/drivers/video/backlight/qcom-wled.c @@ -285,16 +285,60 @@ static int wled5_set_brightness(struct wled *wled, u16 brightness) WLED5_SINK_REG_MOD_A_BRIGHTNESS_LSB : WLED5_SINK_REG_MOD_B_BRIGHTNESS_LSB; rc = regmap_bulk_write(wled->regmap, wled->sink_addr + offset, &v, sizeof(v)); return rc; } +static int wled_read_brightness(struct wled *wled) +{ + u16 addr, mask; + __le16 v; + u32 val; + int rc; + + rc = regmap_read(wled->regmap, wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, + &val); + if (rc < 0) + return rc; + + if (!(val & WLED3_CTRL_REG_MOD_EN_MASK)) + return 0; + + switch (wled->version) { + case 3: + addr = wled->sink_addr + + WLED3_SINK_REG_BRIGHT(wled->cfg.enabled_strings[0]); + mask = WLED3_SINK_REG_BRIGHT_MAX; + break; + case 4: + addr = wled->sink_addr + + WLED4_SINK_REG_BRIGHT(wled->cfg.enabled_strings[0]); + mask = WLED3_SINK_REG_BRIGHT_MAX; + break; + case 5: + addr = wled->sink_addr + (wled->cfg.mod_sel == MOD_A ? + WLED5_SINK_REG_MOD_A_BRIGHTNESS_LSB : + WLED5_SINK_REG_MOD_B_BRIGHTNESS_LSB); + mask = WLED5_SINK_REG_BRIGHT_MAX_15B; + break; + default: + dev_err(wled->dev, "Invalid WLED version\n"); + return -EINVAL; + } + + rc = regmap_bulk_read(wled->regmap, addr, &v, sizeof(v)); + if (rc < 0) + return rc; + + return min_t(u32, le16_to_cpu(v) & mask, wled->max_brightness); +} + static void wled_ovp_work(struct work_struct *work) { struct wled *wled = container_of(work, struct wled, ovp_work.work); enable_irq(wled->ovp_irq); } static int wled_module_enable(struct wled *wled, int val) @@ -475,16 +519,28 @@ static int wled_update_status(struct backlight_device *bl) wled->brightness = brightness; unlock_mutex: mutex_unlock(&wled->lock); return rc; } +static int wled_get_brightness(struct backlight_device *bl) +{ + struct wled *wled = bl_get_data(bl); + int rc; + + mutex_lock(&wled->lock); + rc = wled_read_brightness(wled); + mutex_unlock(&wled->lock); + + return rc; +} + static int wled4_cabc_config(struct wled *wled, bool enable) { int i, j, rc; u8 val; for (i = 0; i < wled->cfg.num_strings; i++) { j = wled->cfg.enabled_strings[i]; @@ -1646,25 +1702,25 @@ static int wled_configure_ovp_irq(struct wled *wled, if (!wled->brightness) disable_irq(wled->ovp_irq); return 0; } static const struct backlight_ops wled_ops = { .update_status = wled_update_status, + .get_brightness = wled_get_brightness, }; static int wled_probe(struct platform_device *pdev) { struct backlight_properties props; struct backlight_device *bl; struct wled *wled; struct regmap *regmap; - u32 mod_en; u32 val; int rc; regmap = dev_get_regmap(pdev->dev.parent, NULL); if (!regmap) { dev_err(&pdev->dev, "Unable to get regmap\n"); return -EINVAL; } @@ -1728,41 +1784,37 @@ static int wled_probe(struct platform_device *pdev) } INIT_DELAYED_WORK(&wled->ovp_work, wled_ovp_work); val = WLED_DEFAULT_BRIGHTNESS; of_property_read_u32(pdev->dev.of_node, "default-brightness", &val); /* - * The module may already be enabled, either by a bootloader that left - * the backlight lit or by the setup above. Record that, so that the - * first brightness update does not enable an already enabled module, - * and so that the OVP irq is armed from probe rather than from that - * first update. + * The module may already be lit, either by the bootloader or by the + * setup above. Start from what the hardware is driving, so that the + * first brightness update does not step the brightness. */ - rc = regmap_read(wled->regmap, wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, - &mod_en); + rc = wled_read_brightness(wled); if (rc < 0) return rc; - if (mod_en & WLED3_CTRL_REG_MOD_EN_MASK) - wled->brightness = val; + wled->brightness = rc; rc = wled_configure_short_irq(wled, pdev); if (rc < 0) return rc; rc = wled_configure_ovp_irq(wled, pdev); if (rc < 0) return rc; memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; - props.brightness = val; + props.brightness = wled->brightness ?: val; props.max_brightness = wled->max_brightness; bl = devm_backlight_device_register(&pdev->dev, wled->name, &pdev->dev, wled, &wled_ops, &props); return PTR_ERR_OR_ZERO(bl); }; static void wled_remove(struct platform_device *pdev) -- 2.55.0
