On Tue, Jun 18, 2024 at 04:59:45PM GMT, Dzmitry Sankouski wrote: > Add support for MIPI-DSI based S6E3HA8 AMOLED panel > driver. This panel has 1440x2960 resolution, 5.8-inch physical > size, and can be found in starqltechn device. > Brightness regulation is not yet supported. > > Signed-off-by: Dzmitry Sankouski <dsankouski@xxxxxxxxx> > --- > MAINTAINERS | 1 + > drivers/gpu/drm/panel/Kconfig | 7 + > drivers/gpu/drm/panel/Makefile | 1 + > drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c | 426 ++++++++++++++++++++++++++ > 4 files changed, 435 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 92a5d0a56353..fae3b8ea9ce4 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -7154,6 +7154,7 @@ DRM DRIVER FOR SAMSUNG S6E3HA8 PANELS > M: Dzmitry Sankouski <dsankouski@xxxxxxxxx> > S: Maintained > F: Documentation/devicetree/bindings/display/panel/samsung,s6e3ha8.yaml > +F: drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c > > DRM DRIVER FOR SITRONIX ST7586 PANELS > M: David Lechner <david@xxxxxxxxxxxxxx> > diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig > index 2ae0eb0638f3..903fc8c155c0 100644 > --- a/drivers/gpu/drm/panel/Kconfig > +++ b/drivers/gpu/drm/panel/Kconfig > @@ -651,6 +651,13 @@ config DRM_PANEL_SAMSUNG_S6E3HA2 > depends on BACKLIGHT_CLASS_DEVICE > select VIDEOMODE_HELPERS > > +config DRM_PANEL_SAMSUNG_S6E3HA8 > + tristate "Samsung S6E3HA8 DSI video mode panel" > + depends on OF > + depends on DRM_MIPI_DSI > + depends on BACKLIGHT_CLASS_DEVICE > + select VIDEOMODE_HELPERS > + > config DRM_PANEL_SAMSUNG_S6E63J0X03 > tristate "Samsung S6E63J0X03 DSI command mode panel" > depends on OF > diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile > index f0203f6e02f4..71774cc5820a 100644 > --- a/drivers/gpu/drm/panel/Makefile > +++ b/drivers/gpu/drm/panel/Makefile > @@ -66,6 +66,7 @@ obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6D27A1) += panel-samsung-s6d27a1.o > obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0) += panel-samsung-s6d7aa0.o > obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7) += panel-samsung-s6e3fa7.o > obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2) += panel-samsung-s6e3ha2.o > +obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E3HA8) += panel-samsung-s6e3ha8.o > obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03) += panel-samsung-s6e63j0x03.o > obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E63M0) += panel-samsung-s6e63m0.o > obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_SPI) += panel-samsung-s6e63m0-spi.o > diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c b/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c > new file mode 100644 > index 000000000000..49d629643171 > --- /dev/null > +++ b/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c > @@ -0,0 +1,426 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Generated with linux-mdss-dsi-panel-driver-generator from vendor device tree: > + * Copyright (c) 2013, The Linux Foundation. All rights reserved. > + * Copyright (c) 2024 Dzmitry Sankouski <dsankouski@xxxxxxxxx> > + */ > + > +#include <linux/delay.h> > +#include <linux/gpio/consumer.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/regulator/consumer.h> > + > +#include <drm/display/drm_dsc.h> > +#include <drm/display/drm_dsc_helper.h> > +#include <drm/drm_mipi_dsi.h> > +#include <drm/drm_modes.h> > +#include <drm/drm_panel.h> > + > +struct s6e3ha8 { > + struct drm_panel panel; > + struct mipi_dsi_device *dsi; > + struct drm_dsc_config dsc; > + struct gpio_desc *reset_gpio; > + struct regulator_bulk_data supplies[3]; > +}; > + > +static inline > +struct s6e3ha8 *to_s6e3ha8_amb577px01_wqhd(struct drm_panel *panel) > +{ > + return container_of(panel, struct s6e3ha8, panel); > +} > + > +#define s6e3ha8_call_write_func(ret, func) do { \ > + ret = (func); \ > + if (ret < 0) \ > + return ret; \ > +} while (0) Please rework the driver to use mipi_dsi_*_multi() family of functions. Using the mipi_dsi_multi_context should make this wrapper obsolete too. > + > +static int s6e3ha8_test_key_on_lvl1(struct mipi_dsi_device *dsi) > +{ > + static const u8 d[] = { 0x9f, 0xa5, 0xa5 }; > + > + return mipi_dsi_dcs_write_buffer(dsi, d, ARRAY_SIZE(d)); > + return 0; Ugh. So which return is it? > +} > + [...] > +static int s6e3ha8_power_on(struct s6e3ha8 *ctx) > +{ > + int ret; > + > + ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies); Inline this function, it's just regulator_bulk_enable() in the end. > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static int s6e3ha8_power_off(struct s6e3ha8 *ctx) > +{ > + return regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies); > +} > + > +static void s6e3ha8_amb577px01_wqhd_reset(struct s6e3ha8 *ctx) > +{ > + gpiod_set_value_cansleep(ctx->reset_gpio, 1); > + usleep_range(5000, 6000); > + gpiod_set_value_cansleep(ctx->reset_gpio, 0); > + usleep_range(5000, 6000); > + gpiod_set_value_cansleep(ctx->reset_gpio, 1); > + usleep_range(5000, 6000); > +} > + > +static int s6e3ha8_amb577px01_wqhd_on(struct s6e3ha8 *ctx) > +{ > + struct mipi_dsi_device *dsi = ctx->dsi; > + struct device *dev = &dsi->dev; > + int ret; > + > + dsi->mode_flags |= MIPI_DSI_MODE_LPM; > + > + s6e3ha8_test_key_on_lvl1(dsi); > + s6e3ha8_test_key_on_lvl2(dsi); > + > + ret = mipi_dsi_compression_mode(dsi, true); > + if (ret < 0) { > + dev_err(dev, "Failed to set compression mode: %d\n", ret); > + return ret; > + } Interesting, compression mode is being set before the PPS programming? > + > + s6e3ha8_test_key_off_lvl2(dsi); > + > + ret = mipi_dsi_dcs_exit_sleep_mode(dsi); > + if (ret < 0) { > + dev_err(dev, "Failed to exit sleep mode: %d\n", ret); > + return ret; > + } > + usleep_range(5000, 6000); > + > + s6e3ha8_test_key_on_lvl2(dsi); > + mipi_dsi_generic_write_seq(dsi, 0xf2, 0x13); > + s6e3ha8_test_key_off_lvl2(dsi); > + > + usleep_range(10000, 11000); > + > + s6e3ha8_test_key_on_lvl2(dsi); > + mipi_dsi_generic_write_seq(dsi, 0xf2, 0x13); > + s6e3ha8_test_key_off_lvl2(dsi); > + > + /* OMOK setting 1 (Initial setting) - Scaler Latch Setting Guide */ > + s6e3ha8_test_key_on_lvl2(dsi); > + mipi_dsi_generic_write_seq(dsi, 0xb0, 0x07); > + /* latch setting 1 : Scaler on/off & address setting & PPS setting -> Image update latch */ > + mipi_dsi_generic_write_seq(dsi, 0xf2, 0x3c, 0x10); > + mipi_dsi_generic_write_seq(dsi, 0xb0, 0x0b); > + /* latch setting 2 : Ratio change mode -> Image update latch */ > + mipi_dsi_generic_write_seq(dsi, 0xf2, 0x30); > + /* OMOK setting 2 - Seamless setting guide : WQHD */ > + mipi_dsi_generic_write_seq(dsi, 0x2a, 0x00, 0x00, 0x05, 0x9f); /* CASET */ > + mipi_dsi_generic_write_seq(dsi, 0x2b, 0x00, 0x00, 0x0b, 0x8f); /* PASET */ > + mipi_dsi_generic_write_seq(dsi, 0xba, 0x01); /* scaler setup : scaler off */ > + s6e3ha8_test_key_off_lvl2(dsi); > + mipi_dsi_generic_write_seq(dsi, 0x35, 0x00); /* TE Vsync ON */ > + s6e3ha8_test_key_on_lvl2(dsi); > + mipi_dsi_generic_write_seq(dsi, 0xed, 0x4c); /* ERR_FG */ > + s6e3ha8_test_key_off_lvl2(dsi); > + s6e3ha8_test_key_on_lvl3(dsi); > + /* FFC Setting 897.6Mbps */ > + mipi_dsi_generic_write_seq(dsi, 0xc5, 0x0d, 0x10, 0xb4, 0x3e, 0x01); > + s6e3ha8_test_key_off_lvl3(dsi); > + s6e3ha8_test_key_on_lvl2(dsi); > + mipi_dsi_generic_write_seq(dsi, 0xb9, > + 0x00, 0xb0, 0x81, 0x09, 0x00, 0x00, 0x00, > + 0x11, 0x03); /* TSP HSYNC Setting */ > + s6e3ha8_test_key_off_lvl2(dsi); > + s6e3ha8_test_key_on_lvl2(dsi); > + mipi_dsi_generic_write_seq(dsi, 0xb0, 0x03); > + mipi_dsi_generic_write_seq(dsi, 0xf6, 0x43); > + s6e3ha8_test_key_off_lvl2(dsi); > + s6e3ha8_test_key_on_lvl2(dsi); > + /* Brightness condition set */ > + mipi_dsi_generic_write_seq(dsi, 0xca, > + 0x07, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, > + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, > + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, > + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, > + 0x80, 0x80, 0x80, 0x00, 0x00, 0x00); > + mipi_dsi_generic_write_seq(dsi, 0xb1, 0x00, 0x0c); /* AID Set : 0% */ > + mipi_dsi_generic_write_seq(dsi, 0xb5, > + 0x19, 0xdc, 0x16, 0x01, 0x34, 0x67, 0x9a, > + 0xcd, 0x01, 0x22, 0x33, 0x44, 0x00, 0x00, > + 0x05, 0x55, 0xcc, 0x0c, 0x01, 0x11, 0x11, > + 0x10); /* MPS/ELVSS Setting */ > + mipi_dsi_generic_write_seq(dsi, 0xf4, 0xeb, 0x28); /* VINT */ > + mipi_dsi_generic_write_seq(dsi, 0xf7, 0x03); /* Gamma, LTPS(AID) update */ > + s6e3ha8_test_key_off_lvl2(dsi); > + s6e3ha8_test_key_off_lvl1(dsi); > + > + return 0; > +} > + > +static int s6e3ha8_enable(struct drm_panel *panel) > +{ > + struct s6e3ha8 *ctx = to_s6e3ha8_amb577px01_wqhd(panel); > + struct mipi_dsi_device *dsi = ctx->dsi; > + int ret; > + > + s6e3ha8_call_write_func(ret, s6e3ha8_test_key_on_lvl1(dsi)); > + s6e3ha8_call_write_func(ret, mipi_dsi_dcs_set_display_on(dsi)); > + s6e3ha8_call_write_func(ret, s6e3ha8_test_key_off_lvl1(dsi)); > + > + return 0; > +} > + > +static int s6e3ha8_disable(struct drm_panel *panel) > +{ > + struct s6e3ha8 *ctx = to_s6e3ha8_amb577px01_wqhd(panel); > + struct mipi_dsi_device *dsi = ctx->dsi; > + int ret; > + > + s6e3ha8_call_write_func(ret, s6e3ha8_test_key_on_lvl1(dsi)); > + s6e3ha8_call_write_func(ret, mipi_dsi_dcs_set_display_off(dsi)); > + s6e3ha8_call_write_func(ret, s6e3ha8_test_key_off_lvl1(dsi)); > + msleep(20); > + > + s6e3ha8_call_write_func(ret, s6e3ha8_test_key_on_lvl2(dsi)); > + s6e3ha8_call_write_func(ret, s6e3ha8_afc_off(dsi)); > + s6e3ha8_call_write_func(ret, s6e3ha8_test_key_off_lvl2(dsi)); > + > + msleep(160); > + > + return 0; > +} > + > +static int s6e3ha8_amb577px01_wqhd_prepare(struct drm_panel *panel) > +{ > + struct s6e3ha8 *ctx = to_s6e3ha8_amb577px01_wqhd(panel); > + struct mipi_dsi_device *dsi = ctx->dsi; > + struct device *dev = &dsi->dev; > + struct drm_dsc_picture_parameter_set pps; > + int ret; > + > + s6e3ha8_power_on(ctx); > + msleep(120); > + s6e3ha8_amb577px01_wqhd_reset(ctx); > + ret = s6e3ha8_amb577px01_wqhd_on(ctx); > + > + if (ret < 0) { > + dev_err(dev, "Failed to initialize panel: %d\n", ret); > + gpiod_set_value_cansleep(ctx->reset_gpio, 1); > + goto err; > + } > + > + drm_dsc_pps_payload_pack(&pps, &ctx->dsc); > + > + s6e3ha8_test_key_on_lvl1(dsi); > + ret = mipi_dsi_picture_parameter_set(ctx->dsi, &pps); > + if (ret < 0) { > + dev_err(panel->dev, "failed to transmit PPS: %d\n", ret); > + return ret; > + } > + s6e3ha8_test_key_off_lvl1(dsi); > + > + ret = mipi_dsi_compression_mode(ctx->dsi, true); > + if (ret < 0) { > + dev_err(dev, "failed to enable compression mode: %d\n", ret); > + return ret; > + } Again? > + > + > + msleep(28); > + > + return 0; > +err: > + s6e3ha8_power_off(ctx); > + return ret; > +} > + > +static int s6e3ha8_amb577px01_wqhd_unprepare(struct drm_panel *panel) > +{ > + struct s6e3ha8 *ctx = to_s6e3ha8_amb577px01_wqhd(panel); > + > + return s6e3ha8_power_off(ctx); > +} > + > +static const struct drm_display_mode s6e3ha8_amb577px01_wqhd_mode = { > + .clock = (1440 + 116 + 44 + 120) * (2960 + 120 + 80 + 124) * 60 / 1000, > + .hdisplay = 1440, > + .hsync_start = 1440 + 116, > + .hsync_end = 1440 + 116 + 44, > + .htotal = 1440 + 116 + 44 + 120, > + .vdisplay = 2960, > + .vsync_start = 2960 + 120, > + .vsync_end = 2960 + 120 + 80, > + .vtotal = 2960 + 120 + 80 + 124, > + .width_mm = 64, > + .height_mm = 132, > +}; > + > +static int s6e3ha8_amb577px01_wqhd_get_modes(struct drm_panel *panel, > + struct drm_connector *connector) > +{ > + struct drm_display_mode *mode; > + > + mode = drm_mode_duplicate(connector->dev, &s6e3ha8_amb577px01_wqhd_mode); > + if (!mode) > + return -ENOMEM; > + > + drm_mode_set_name(mode); > + > + mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; > + connector->display_info.width_mm = mode->width_mm; > + connector->display_info.height_mm = mode->height_mm; > + drm_mode_probed_add(connector, mode); drm_connector_helper_get_modes_fixed() > + > + return 1; > +} > + -- With best wishes Dmitry