- Use backlight support from drm_panel.
This shifts this driver away from manually handling of power state.
- Add helper function for registering backlight, like other samsung
panel drivers do.
- Use devm_ for backlight register thus benefit from automatic
unregistering. Drop all explicit unregistering.
In s6e3ha2_disable() a 40 ms delay was dropped. Using drm_panel support
backlight is not disable before display is turned off, so delay after
turning off the display is irrelevant.
Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Thierry Reding <thierry.reding@xxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Hoegeun Kwon <hoegeun.kwon@xxxxxxxxxxx>
Cc: Inki Dae <inki.dae@xxxxxxxxxxx>
---
drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 68 ++++++++-----------
1 file changed, 30 insertions(+), 38 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
index 36ebd5a4ac7b..cef781985684 100644
--- a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
+++ b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
@@ -233,7 +233,6 @@ struct s6e3ha2_panel_desc {
struct s6e3ha2 {
struct device *dev;
struct drm_panel panel;
- struct backlight_device *bl_dev;
struct regulator_bulk_data supplies[2];
struct gpio_desc *reset_gpio;
@@ -408,15 +407,10 @@ static int s6e3ha2_gamma_update(struct s6e3ha2 *ctx)
return 0;
}
-static int s6e3ha2_get_brightness(struct backlight_device *bl_dev)
-{
- return bl_dev->props.brightness;
-}
-
static int s6e3ha2_set_vint(struct s6e3ha2 *ctx)
{
- struct backlight_device *bl_dev = ctx->bl_dev;
- unsigned int brightness = bl_dev->props.brightness;
+ struct backlight_device *bl_dev = ctx->panel.backlight;
+ unsigned int brightness = backlight_get_brightness(bl_dev);
unsigned char data[] = { 0xf4, 0x8b,
vint_table[brightness * (S6E3HA2_VINT_STATUS_MAX - 1) /
S6E3HA2_MAX_BRIGHTNESS] };
@@ -432,7 +426,7 @@ static unsigned int s6e3ha2_get_brightness_index(unsigned int brightness)
static int s6e3ha2_update_gamma(struct s6e3ha2 *ctx, unsigned int brightness)
{
- struct backlight_device *bl_dev = ctx->bl_dev;
+ struct backlight_device *bl_dev = ctx->panel.backlight;
unsigned int index = s6e3ha2_get_brightness_index(brightness);
u8 data[S6E3HA2_GAMMA_CMD_CNT + 1] = { 0xca, };
int ret;
@@ -442,7 +436,7 @@ static int s6e3ha2_update_gamma(struct s6e3ha2 *ctx, unsigned int brightness)
s6e3ha2_dcs_write(ctx, data, ARRAY_SIZE(data)));
s6e3ha2_call_write_func(ret, s6e3ha2_gamma_update(ctx));
- bl_dev->props.brightness = brightness;
+ backlight_set_brightness(bl_dev, brightness);
return 0;
}
@@ -450,18 +444,15 @@ static int s6e3ha2_update_gamma(struct s6e3ha2 *ctx, unsigned int brightness)
static int s6e3ha2_set_brightness(struct backlight_device *bl_dev)
{
struct s6e3ha2 *ctx = bl_get_data(bl_dev);
- unsigned int brightness = bl_dev->props.brightness;
+ unsigned int brightness = backlight_get_brightness(bl_dev);
int ret;
if (brightness < S6E3HA2_MIN_BRIGHTNESS ||
- brightness > bl_dev->props.max_brightness) {
+ brightness > backlight_get_max_brightness(bl_dev)) {
dev_err(ctx->dev, "Invalid brightness: %u\n", brightness);
return -EINVAL;
}
- if (bl_dev->props.power > FB_BLANK_NORMAL)
- return -EPERM;
-
s6e3ha2_call_write_func(ret, s6e3ha2_test_key_on_f0(ctx));
s6e3ha2_call_write_func(ret, s6e3ha2_update_gamma(ctx, brightness));
s6e3ha2_call_write_func(ret, s6e3ha2_aor_control(ctx));
@@ -472,7 +463,6 @@ static int s6e3ha2_set_brightness(struct backlight_device *bl_dev)
}
static const struct backlight_ops s6e3ha2_bl_ops = {
- .get_brightness = s6e3ha2_get_brightness,
.update_status = s6e3ha2_set_brightness,
};
@@ -508,9 +498,6 @@ static int s6e3ha2_disable(struct drm_panel *panel)
s6e3ha2_call_write_func(ret, mipi_dsi_dcs_enter_sleep_mode(dsi));
s6e3ha2_call_write_func(ret, mipi_dsi_dcs_set_display_off(dsi));
- msleep(40);
- ctx->bl_dev->props.power = FB_BLANK_NORMAL;
-
return 0;
}
@@ -555,8 +542,6 @@ static int s6e3ha2_prepare(struct drm_panel *panel)
if (ret < 0)
goto err;
- ctx->bl_dev->props.power = FB_BLANK_NORMAL;
-
return 0;
err:
@@ -588,7 +573,7 @@ static int s6e3ha2_enable(struct drm_panel *panel)
s6e3ha2_call_write_func(ret, s6e3ha2_te_start_setting(ctx));
/* brightness setting */
- s6e3ha2_call_write_func(ret, s6e3ha2_set_brightness(ctx->bl_dev));
+ s6e3ha2_call_write_func(ret, s6e3ha2_set_brightness(panel->backlight));
s6e3ha2_call_write_func(ret, s6e3ha2_aor_control(ctx));
s6e3ha2_call_write_func(ret, s6e3ha2_caps_elvss_set(ctx));
s6e3ha2_call_write_func(ret, s6e3ha2_gamma_update(ctx));
@@ -602,7 +587,6 @@ static int s6e3ha2_enable(struct drm_panel *panel)
s6e3ha2_call_write_func(ret, s6e3ha2_test_key_off_f0(ctx));
s6e3ha2_call_write_func(ret, mipi_dsi_dcs_set_display_on(dsi));
- ctx->bl_dev->props.power = FB_BLANK_UNBLANK;
return 0;
}
@@ -678,6 +662,25 @@ static const struct drm_panel_funcs s6e3ha2_drm_funcs = {
.get_modes = s6e3ha2_get_modes,
};
+static int s6e3ha2_backlight_register(struct s6e3ha2 *ctx)
+{
+ DECLARE_BACKLIGHT_INIT_RAW(props, S6E3HA2_DEFAULT_BRIGHTNESS, S6E3HA2_MAX_BRIGHTNESS);
+ struct device *dev = ctx->dev;
+ struct backlight_device *bd;
+ int ret = 0;
+
+ bd = devm_backlight_device_register(dev, "panel", dev, ctx,
+ &s6e3ha2_bl_ops, &props);
+ if (IS_ERR(bd)) {
+ ret = PTR_ERR(bd);
+ DRM_DEV_ERROR(dev, "error registering backlight device (%d)\n", ret);
+ return ret;
+ }
+
+ ctx->panel.backlight = bd;
+ return ret;
+}
+
static int s6e3ha2_probe(struct mipi_dsi_device *dsi)
{
struct device *dev = &dsi->dev;
@@ -721,23 +724,16 @@ static int s6e3ha2_probe(struct mipi_dsi_device *dsi)
return PTR_ERR(ctx->enable_gpio);
}
- ctx->bl_dev = backlight_device_register("s6e3ha2", dev, ctx,
- &s6e3ha2_bl_ops, NULL);
- if (IS_ERR(ctx->bl_dev)) {
- dev_err(dev, "failed to register backlight device\n");
- return PTR_ERR(ctx->bl_dev);
- }
-
- ctx->bl_dev->props.max_brightness = S6E3HA2_MAX_BRIGHTNESS;
- ctx->bl_dev->props.brightness = S6E3HA2_DEFAULT_BRIGHTNESS;
- ctx->bl_dev->props.power = FB_BLANK_POWERDOWN;
+ ret = s6e3ha2_backlight_register(ctx);
+ if (ret)
+ return ret;
drm_panel_init(&ctx->panel, dev, &s6e3ha2_drm_funcs,
DRM_MODE_CONNECTOR_DSI);
ret = drm_panel_add(&ctx->panel);
if (ret < 0)
- goto unregister_backlight;
+ return ret;
ret = mipi_dsi_attach(dsi);
if (ret < 0)
@@ -748,9 +744,6 @@ static int s6e3ha2_probe(struct mipi_dsi_device *dsi)
remove_panel:
drm_panel_remove(&ctx->panel);
-unregister_backlight:
- backlight_device_unregister(ctx->bl_dev);
-
return ret;
}
@@ -760,7 +753,6 @@ static int s6e3ha2_remove(struct mipi_dsi_device *dsi)
mipi_dsi_detach(dsi);
drm_panel_remove(&ctx->panel);
- backlight_device_unregister(ctx->bl_dev);
return 0;
}
--
2.25.1
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
