Hi,
On Tue, May 25, 2021 at 12:31 AM Rajeev Nandan <rajeevny@xxxxxxxxxxxxxx> wrote:
>
> @@ -171,6 +172,19 @@ struct panel_desc {
>
> /** @connector_type: LVDS, eDP, DSI, DPI, etc. */
> int connector_type;
> +
> + /**
> + * @uses_dpcd_backlight: Panel supports eDP dpcd backlight control.
> + *
> + * Set true, if the panel supports backlight control over eDP AUX channel
> + * using DPCD registers as per VESA's standard.
> + */
> + bool uses_dpcd_backlight;
> +};
> +
> +struct edp_backlight {
> + struct backlight_device *dev;
Can you pick a name other than "dev". In my mind "dev" means you've
got a "struct device" or a "struct device *".
> + struct drm_edp_backlight_info info;
> };
>
> struct panel_simple {
> @@ -194,6 +208,8 @@ struct panel_simple {
>
> struct edid *edid;
>
> + struct edp_backlight *edp_bl;
> +
I don't think you need to add this pointer. See below for details, but
basically the backlight device should be in base.backlight. Any code
that needs the containing structure can use the standard
"container_of" syntax.
> struct drm_display_mode override_mode;
>
> enum drm_panel_orientation orientation;
> @@ -330,10 +346,14 @@ static void panel_simple_wait(ktime_t start_ktime, unsigned int min_ms)
> static int panel_simple_disable(struct drm_panel *panel)
> {
> struct panel_simple *p = to_panel_simple(panel);
> + struct edp_backlight *bl = p->edp_bl;
>
> if (!p->enabled)
> return 0;
>
> + if (p->desc->uses_dpcd_backlight && bl)
> + drm_edp_backlight_disable(p->aux, &bl->info);
> +
It feels like this shouldn't be needed. I would have expected that
your backlight should be in 'panel->backlight'. Then
drm_panel_enable() will call backlight_enable() on your backlight
automatically after calling the panel's enable function.
> if (p->desc->delay.disable)
> msleep(p->desc->delay.disable);
>
> @@ -496,6 +516,7 @@ static int panel_simple_prepare(struct drm_panel *panel)
> static int panel_simple_enable(struct drm_panel *panel)
> {
> struct panel_simple *p = to_panel_simple(panel);
> + struct edp_backlight *bl = p->edp_bl;
>
> if (p->enabled)
> return 0;
> @@ -505,6 +526,10 @@ static int panel_simple_enable(struct drm_panel *panel)
>
> panel_simple_wait(p->prepared_time, p->desc->delay.prepare_to_enable);
>
> + if (p->desc->uses_dpcd_backlight && bl)
> + drm_edp_backlight_enable(p->aux, &bl->info,
> + bl->dev->props.brightness);
> +
Similar to disable, this shouldn't be needed.
> p->enabled = true;
>
> return 0;
> @@ -565,6 +590,59 @@ static const struct drm_panel_funcs panel_simple_funcs = {
> .get_timings = panel_simple_get_timings,
> };
>
> +static int edp_backlight_update_status(struct backlight_device *bd)
> +{
> + struct panel_simple *p = bl_get_data(bd);
> + struct edp_backlight *bl = p->edp_bl;
> +
> + if (!p->enabled)
> + return 0;
> +
> + return drm_edp_backlight_set_level(p->aux, &bl->info, bd->props.brightness);
I notice that the "nouveau" driver grabs a whole pile of locks around
this. Do we need some of those? I guess perhaps checking "p->enabled"
isn't so valid without holding some of those locks.
Actually, I guess you probably can't look at "p->enabled" anyway if
this gets moved out of panel-simple as I'm suggesting.
...but do you even need something like this check? Shouldn't it be
handled by the fact that drm_panel will handle enabling/disabling the
backlight at the right times?
> +}
> +
> +static const struct backlight_ops edp_backlight_ops = {
> + .update_status = edp_backlight_update_status,
> +};
> +
> +static int edp_backlight_register(struct device *dev, struct panel_simple *panel)
> +{
> + struct edp_backlight *bl;
> + struct backlight_properties props = { 0 };
> + u16 current_level;
> + u8 current_mode;
> + u8 edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE];
> + int ret;
> +
> + bl = devm_kzalloc(dev, sizeof(*bl), GFP_KERNEL);
> + if (!bl)
> + return -ENOMEM;
> +
> + ret = drm_dp_dpcd_read(panel->aux, DP_EDP_DPCD_REV, edp_dpcd,
> + EDP_DISPLAY_CTL_CAP_SIZE);
> + if (ret < 0)
> + return ret;
> +
> + ret = drm_edp_backlight_init(panel->aux, &bl->info, 0, edp_dpcd,
> + ¤t_level, ¤t_mode);
> + if (ret < 0)
> + return ret;
> +
> + props.type = BACKLIGHT_RAW;
> + props.brightness = current_level;
> + props.max_brightness = bl->info.max;
> +
> + bl->dev = devm_backlight_device_register(dev, "edp_backlight",
> + dev, panel,
> + &edp_backlight_ops, &props);
> + if (IS_ERR(bl->dev))
> + return PTR_ERR(bl->dev);
> +
> + panel->edp_bl = bl;
> +
> + return 0;
> +}
> +
I expect there to be quite a bit of pushback to putting this directly
into panel-simple. How about if you move edp_backlight_register() into
drm_panel.c, parallel to drm_panel_of_backlight(). Maybe you'd call it
drm_panel_dp_aux_backlight() to make it look symmetric?
If you do that then the amount of code / complexity being added to
"simple" panel is quite small. I think it would just come down to
adding the boolean flag and the patch to probe that you have below.
Actually, now that I think about it, you could maybe even get by
_without_ the boolean flag? I think you could use these rules
(untested!):
1. Call drm_panel_of_backlight() always, just like we do today. If a
backlight was specified in the device tree then we should use it.
2. If no backlight was specified in the device tree then, I believe,
drm_panel_of_backlight() will return with no errors but will have
panel->backlight set to NULL.
3. If there was no backlight specified in the device tree and you have
the DP AUX channel and drm_edp_backlight_supported() then create a DP
AUX backlight.
The one feature that wouldn't be supported by the above would be
"DP_EDP_BACKLIGHT_AUX_PWM_PRODUCT_CAP". Presumably that's fine. If
someone later wants to figure out how to solve that then they can.
> static struct panel_desc panel_dpi;
>
> static int panel_dpi_probe(struct device *dev,
> @@ -796,9 +874,24 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc,
>
> drm_panel_init(&panel->base, dev, &panel_simple_funcs, connector_type);
>
> - err = drm_panel_of_backlight(&panel->base);
> - if (err)
> - goto disable_pm_runtime;
> + if (panel->desc->uses_dpcd_backlight) {
> + if (!panel->aux) {
> + dev_err(dev, "edp backlight needs DP aux\n");
> + err = -EINVAL;
> + goto disable_pm_runtime;
> + }
> +
> + err = edp_backlight_register(dev, panel);
> + if (err) {
> + dev_err(dev, "failed to register edp backlight %d\n", err);
> + goto disable_pm_runtime;
> + }
> +
> + } else {
nit: get rid of the blank line above the "} else {"
> + err = drm_panel_of_backlight(&panel->base);
> + if (err)
> + goto disable_pm_runtime;
> + }
See above where I'm suggesting some different logic. Specifically:
always try the drm_panel_of_backlight() call and then fallback to the
AUX backlight if "panel->base.backlight" is NULL and "panel->aux" is
not NULL.
-Doug
