| Message ID | 20240422090310.3311429-3-yangcong5@huaqin.corp-partner.google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Break out as separate driver and add BOE nv110wum-l60 IVO t109nw41 MIPI-DSI panel | expand |
Hi, On Mon, Apr 22, 2024 at 2:03 AM Cong Yang <yangcong5@huaqin.corp-partner.google.com> wrote: > > The Starry HX83102 based mipi panel should never have been part of the boe > tv101wum driver. Discussion with Doug and Linus in V1 [1], we need a > separate driver to enable the hx83102 controller. > > In hx83102 driver, add DSI commands as macros. So it can add some panels > with same control model in the future. > > [1]: https://lore.kernel.org/all/CACRpkdbzYZAS0=zBQJUC4CB2wj4s1h6n6aSAZQvdMV95r3zRUw@mail.gmail.com > > Signed-off-by: Cong Yang <yangcong5@huaqin.corp-partner.google.com> > --- > drivers/gpu/drm/panel/Kconfig | 9 + > drivers/gpu/drm/panel/Makefile | 1 + > .../gpu/drm/panel/panel-boe-tv101wum-nl6.c | 99 --- > drivers/gpu/drm/panel/panel-himax-hx83102.c | 567 ++++++++++++++++++ > 4 files changed, 577 insertions(+), 99 deletions(-) > create mode 100644 drivers/gpu/drm/panel/panel-himax-hx83102.c > > diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig > index d037b3b8b999..eb378c897353 100644 > --- a/drivers/gpu/drm/panel/Kconfig > +++ b/drivers/gpu/drm/panel/Kconfig > @@ -145,6 +145,15 @@ config DRM_PANEL_LVDS > handling of power supplies or control signals. It implements automatic > backlight handling if the panel is attached to a backlight controller. > > +config DRM_PANEL_HIMAX_HX83102 > + tristate "himax HX83102-based panels" Capital "h" for "Himax". > +#define DRV_NAME "panel-himax-hx83102" I don't think DRV_NAME buys you very much. Get rid of this #define and just use it below. > +struct hx83102 { > + struct drm_panel base; > + struct mipi_dsi_device *dsi; > + > + const struct hx83102_panel_desc *desc; > + > + enum drm_panel_orientation orientation; > + struct regulator *pp1800; > + struct regulator *avee; > + struct regulator *avdd; > + struct gpio_desc *enable_gpio; > + > + bool prepared; We're trying to get rid of the tracking of "prepared" in panels. You should be able to delete this and remove the code dealing with it. The core DRM code should ensure that your prepare/unprepare functions are called appropriately. > +struct hx83102_panel_desc { > + const struct drm_display_mode *modes; > + unsigned int bpc; > + > + /** > + * @width_mm: width of the panel's active display area > + * @height_mm: height of the panel's active display area > + */ > + struct { > + unsigned int width_mm; > + unsigned int height_mm; > + } size; > + > + unsigned long mode_flags; > + enum mipi_dsi_pixel_format format; > + unsigned int lanes; > + bool lp11_before_reset; Seems like you can remove "lp11_before_reset" since it's always true for this controller. If later you find someone using this controller that needs this false then we can always add it back in. I think you could also remove "bpc", "format", and "mode_flags". If these are all the same controller then that will be common between all the panels, right? So you shouldn't need to define those on a per-panel basis... You could maybe even remove "lanes" unless some people using this panel are expected to hook up fewer lanes... > +static int starry_init_cmd(struct hx83102 *ctx) > +{ > + struct mipi_dsi_device *dsi = ctx->dsi; > + > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETEXTC, 0x83, 0x10, 0x21, 0x55, 0x00); > + > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPOWER, 0x2C, 0xB5, 0xB5, 0x31, 0xF1, 0x31, 0xD7, 0x2F, > + 0x36, 0x36, 0x36, 0x36, 0x1A, 0x8B, 0x11, 0x65, 0x00, 0x88, 0xFA, 0xFF, > + 0xFF, 0x8F, 0xFF, 0x08, 0x74, 0x33); I know this is a sticking point between Linus W. and me, but I'm really not a fan of all the hardcoded function calls since it bloats the code so much. I think we need to stick with something more table based at least for the majority of the commands. If I understand correctly, Linus was OK w/ something table based as long as it was in common code [1]. I think he also wanted the "delay" out of the table, but since those always seem to be at the beginning or the end it seems like we could still have the majority of the code as table based. Do you want to make an attempt at that? If not I can try to find some time to write up a patch in the next week or so. [1] https://lore.kernel.org/r/CACRpkdYtM=5jdQddCqRFgBRXvcJEjk1ULJNKKFz7jhhkGxV59Q@mail.gmail.com ...also: nit that, in general, the Linux community prefers lowercase hex, so 0xfa instead of 0xFA, for instance. > +static int hx83102_get_modes(struct drm_panel *panel, > + struct drm_connector *connector) > +{ > + struct hx83102 *ctx = panel_to_hx83102(panel); > + const struct drm_display_mode *m = ctx->desc->modes; > + struct drm_display_mode *mode; > + > + mode = drm_mode_duplicate(connector->dev, m); > + if (!mode) { > + dev_err(panel->dev, "failed to add mode %ux%u@%u\n", > + m->hdisplay, m->vdisplay, drm_mode_vrefresh(m)); > + return -ENOMEM; > + } nit: no need for an error message when drm_mode_duplicate() fails. It is incredibly unlikely that the allocation will fail and the Linux kernel will already do a stack crawl in the case that it does fail. > + /* > + * TODO: Remove once all drm drivers call > + * drm_connector_set_orientation_from_panel() > + */ > + drm_connector_set_panel_orientation(connector, ctx->orientation); Pretty sure you can drop the call to drm_connector_set_panel_orientation() here. I believe that nearly everyone is using panel_bridge which will handle this for you. > +static int hx83102_panel_add(struct hx83102 *ctx) > +{ > + struct device *dev = &ctx->dsi->dev; > + int err; > + > + ctx->avdd = devm_regulator_get(dev, "avdd"); > + if (IS_ERR(ctx->avdd)) > + return PTR_ERR(ctx->avdd); > + > + ctx->avee = devm_regulator_get(dev, "avee"); > + if (IS_ERR(ctx->avee)) > + return PTR_ERR(ctx->avee); > + > + ctx->pp1800 = devm_regulator_get(dev, "pp1800"); > + if (IS_ERR(ctx->pp1800)) > + return PTR_ERR(ctx->pp1800); > + > + ctx->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW); > + if (IS_ERR(ctx->enable_gpio)) { > + dev_err(dev, "cannot get reset-gpios %ld\n", it's not "reset-gpios". > + PTR_ERR(ctx->enable_gpio)); > + return PTR_ERR(ctx->enable_gpio); Rather than the above, use "dev_err_probe" and combine into one line. Untested: if (IS_ERR(ctx->enable_gpio)) return dev_err_probe(dev, PTR_ERR(ctx->enable_gpio), "Cannot get enable GPIO\n"); > + } > + > + gpiod_set_value(ctx->enable_gpio, 0); You don't need the above line. When you got the GPIO you already passed "GPIOD_OUT_LOW" which means that this is redundant. > + > + ctx->base.prepare_prev_first = true; > + > + drm_panel_init(&ctx->base, dev, &hx83102_drm_funcs, > + DRM_MODE_CONNECTOR_DSI); > + err = of_drm_get_panel_orientation(dev->of_node, &ctx->orientation); > + if (err < 0) { > + dev_err(dev, "%pOF: failed to get orientation %d\n", dev->of_node, err); > + return err; > + } Could also use "dev_err_probe" to make the above one line. Not sure you really need the of_node name, too... if (err < 0) return dev_err_probe(dev, err, "failed to get orientation\n"); -Doug
Hi, Thanks for review. Doug Anderson <dianders@chromium.org> 于2024年4月23日周二 05:24写道： > > Hi, > > On Mon, Apr 22, 2024 at 2:03 AM Cong Yang > <yangcong5@huaqin.corp-partner.google.com> wrote: > > > > The Starry HX83102 based mipi panel should never have been part of the boe > > tv101wum driver. Discussion with Doug and Linus in V1 [1], we need a > > separate driver to enable the hx83102 controller. > > > > In hx83102 driver, add DSI commands as macros. So it can add some panels > > with same control model in the future. > > > > [1]: https://lore.kernel.org/all/CACRpkdbzYZAS0=zBQJUC4CB2wj4s1h6n6aSAZQvdMV95r3zRUw@mail.gmail.com > > > > Signed-off-by: Cong Yang <yangcong5@huaqin.corp-partner.google.com> > > --- > > drivers/gpu/drm/panel/Kconfig | 9 + > > drivers/gpu/drm/panel/Makefile | 1 + > > .../gpu/drm/panel/panel-boe-tv101wum-nl6.c | 99 --- > > drivers/gpu/drm/panel/panel-himax-hx83102.c | 567 ++++++++++++++++++ > > 4 files changed, 577 insertions(+), 99 deletions(-) > > create mode 100644 drivers/gpu/drm/panel/panel-himax-hx83102.c > > > > diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig > > index d037b3b8b999..eb378c897353 100644 > > --- a/drivers/gpu/drm/panel/Kconfig > > +++ b/drivers/gpu/drm/panel/Kconfig > > @@ -145,6 +145,15 @@ config DRM_PANEL_LVDS > > handling of power supplies or control signals. It implements automatic > > backlight handling if the panel is attached to a backlight controller. > > > > +config DRM_PANEL_HIMAX_HX83102 > > + tristate "himax HX83102-based panels" > > Capital "h" for "Himax". Got it, fix in V3. Thanks. > > > > +#define DRV_NAME "panel-himax-hx83102" > > I don't think DRV_NAME buys you very much. Get rid of this #define and > just use it below. Got it, fix in V3. Thanks. > > > > +struct hx83102 { > > + struct drm_panel base; > > + struct mipi_dsi_device *dsi; > > + > > + const struct hx83102_panel_desc *desc; > > + > > + enum drm_panel_orientation orientation; > > + struct regulator *pp1800; > > + struct regulator *avee; > > + struct regulator *avdd; > > + struct gpio_desc *enable_gpio; > > + > > + bool prepared; > > We're trying to get rid of the tracking of "prepared" in panels. You > should be able to delete this and remove the code dealing with it. The > core DRM code should ensure that your prepare/unprepare functions are > called appropriately. Got it, fix in V3. Thanks. > > > > > +struct hx83102_panel_desc { > > + const struct drm_display_mode *modes; > > + unsigned int bpc; > > + > > + /** > > + * @width_mm: width of the panel's active display area > > + * @height_mm: height of the panel's active display area > > + */ > > + struct { > > + unsigned int width_mm; > > + unsigned int height_mm; > > + } size; > > + > > + unsigned long mode_flags; > > + enum mipi_dsi_pixel_format format; > > + unsigned int lanes; > > + bool lp11_before_reset; > > Seems like you can remove "lp11_before_reset" since it's always true > for this controller. If later you find someone using this controller > that needs this false then we can always add it back in. > > I think you could also remove "bpc", "format", and "mode_flags". If > these are all the same controller then that will be common between all > the panels, right? So you shouldn't need to define those on a > per-panel basis... You could maybe even remove "lanes" unless some > people using this panel are expected to hook up fewer lanes... Okay, remove “lanes” together. > > > > +static int starry_init_cmd(struct hx83102 *ctx) > > +{ > > + struct mipi_dsi_device *dsi = ctx->dsi; > > + > > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETEXTC, 0x83, 0x10, 0x21, 0x55, 0x00); > > + > > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPOWER, 0x2C, 0xB5, 0xB5, 0x31, 0xF1, 0x31, 0xD7, 0x2F, > > + 0x36, 0x36, 0x36, 0x36, 0x1A, 0x8B, 0x11, 0x65, 0x00, 0x88, 0xFA, 0xFF, > > + 0xFF, 0x8F, 0xFF, 0x08, 0x74, 0x33); > > I know this is a sticking point between Linus W. and me, but I'm > really not a fan of all the hardcoded function calls since it bloats > the code so much. I think we need to stick with something more table > based at least for the majority of the commands. If I understand > correctly, Linus was OK w/ something table based as long as it was in > common code [1]. I think he also wanted the "delay" out of the table, > but since those always seem to be at the beginning or the end it seems > like we could still have the majority of the code as table based. Do > you want to make an attempt at that? If not I can try to find some > time to write up a patch in the next week or so. Do you mean not add "delay" in the table? However, the delay required by each panel may be different. How should this be handled? It would be great if you could help provide a patch. Thank you so much. > > [1] https://lore.kernel.org/r/CACRpkdYtM=5jdQddCqRFgBRXvcJEjk1ULJNKKFz7jhhkGxV59Q@mail.gmail.com > > ...also: nit that, in general, the Linux community prefers lowercase > hex, so 0xfa instead of 0xFA, for instance. Done. Fix in V3. > > > > +static int hx83102_get_modes(struct drm_panel *panel, > > + struct drm_connector *connector) > > +{ > > + struct hx83102 *ctx = panel_to_hx83102(panel); > > + const struct drm_display_mode *m = ctx->desc->modes; > > + struct drm_display_mode *mode; > > + > > + mode = drm_mode_duplicate(connector->dev, m); > > + if (!mode) { > > + dev_err(panel->dev, "failed to add mode %ux%u@%u\n", > > + m->hdisplay, m->vdisplay, drm_mode_vrefresh(m)); > > + return -ENOMEM; > > + } > > nit: no need for an error message when drm_mode_duplicate() fails. It > is incredibly unlikely that the allocation will fail and the Linux > kernel will already do a stack crawl in the case that it does fail. Got it, fix in V3. Thanks. > > > > + /* > > + * TODO: Remove once all drm drivers call > > + * drm_connector_set_orientation_from_panel() > > + */ > > + drm_connector_set_panel_orientation(connector, ctx->orientation); > > Pretty sure you can drop the call to > drm_connector_set_panel_orientation() here. I believe that nearly > everyone is using panel_bridge which will handle this for you. Got it, fix in V3. Thanks. > > > > +static int hx83102_panel_add(struct hx83102 *ctx) > > +{ > > + struct device *dev = &ctx->dsi->dev; > > + int err; > > + > > + ctx->avdd = devm_regulator_get(dev, "avdd"); > > + if (IS_ERR(ctx->avdd)) > > + return PTR_ERR(ctx->avdd); > > + > > + ctx->avee = devm_regulator_get(dev, "avee"); > > + if (IS_ERR(ctx->avee)) > > + return PTR_ERR(ctx->avee); > > + > > + ctx->pp1800 = devm_regulator_get(dev, "pp1800"); > > + if (IS_ERR(ctx->pp1800)) > > + return PTR_ERR(ctx->pp1800); > > + > > + ctx->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW); > > + if (IS_ERR(ctx->enable_gpio)) { > > + dev_err(dev, "cannot get reset-gpios %ld\n", > > it's not "reset-gpios". > > > > + PTR_ERR(ctx->enable_gpio)); > > + return PTR_ERR(ctx->enable_gpio); > > Rather than the above, use "dev_err_probe" and combine into one line. Untested: > > if (IS_ERR(ctx->enable_gpio)) > return dev_err_probe(dev, PTR_ERR(ctx->enable_gpio), "Cannot get > enable GPIO\n"); Got it, fix in V3. Thanks. > > > > + } > > + > > + gpiod_set_value(ctx->enable_gpio, 0); > > You don't need the above line. When you got the GPIO you already > passed "GPIOD_OUT_LOW" which means that this is redundant. Got it, fix in V3. Thanks. > > > > + > > + ctx->base.prepare_prev_first = true; > > + > > + drm_panel_init(&ctx->base, dev, &hx83102_drm_funcs, > > + DRM_MODE_CONNECTOR_DSI); > > + err = of_drm_get_panel_orientation(dev->of_node, &ctx->orientation); > > + if (err < 0) { > > + dev_err(dev, "%pOF: failed to get orientation %d\n", dev->of_node, err); > > + return err; > > + } > > Could also use "dev_err_probe" to make the above one line. Not sure > you really need the of_node name, too... Okay, fix in V3. Thanks. > > if (err < 0) > return dev_err_probe(dev, err, "failed to get orientation\n"); > > -Doug
Hi, On Tue, Apr 23, 2024 at 2:37 AM cong yang <yangcong5@huaqin.corp-partner.google.com> wrote: > > > > +static int starry_init_cmd(struct hx83102 *ctx) > > > +{ > > > + struct mipi_dsi_device *dsi = ctx->dsi; > > > + > > > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETEXTC, 0x83, 0x10, 0x21, 0x55, 0x00); > > > + > > > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPOWER, 0x2C, 0xB5, 0xB5, 0x31, 0xF1, 0x31, 0xD7, 0x2F, > > > + 0x36, 0x36, 0x36, 0x36, 0x1A, 0x8B, 0x11, 0x65, 0x00, 0x88, 0xFA, 0xFF, > > > + 0xFF, 0x8F, 0xFF, 0x08, 0x74, 0x33); > > > > I know this is a sticking point between Linus W. and me, but I'm > > really not a fan of all the hardcoded function calls since it bloats > > the code so much. I think we need to stick with something more table > > based at least for the majority of the commands. If I understand > > correctly, Linus was OK w/ something table based as long as it was in > > common code [1]. I think he also wanted the "delay" out of the table, > > but since those always seem to be at the beginning or the end it seems > > like we could still have the majority of the code as table based. Do > > you want to make an attempt at that? If not I can try to find some > > time to write up a patch in the next week or so. > > Do you mean not add "delay" in the table? However, the delay > required by each panel may be different. How should this be handled? In the case of the "himax-hx83102" driver, it looks as if all the delays are at the beginning or end of the init sequence. That means you could just make those extra parameters that are set per-panel and you're back to having a simple sequence without delays. If you had panels that needed delays in a more complicated way, you could keep the per-panel functions but just make the bulk of the function calls apply a sequence. For instance: static int my_panel_init_cmd(...) { ret = mipi_dsi_dcs_write_cmd_seq(dsi, my_panel_init_cmd_seq); if (ret) return ret; mdelay(100); ret = mipi_dsi_dcs_write(dsi, ...); if (ret) return ret; mdelay(50); ret = mipi_dsi_dcs_write_cmd_seq(dsi, ...); if (ret) return ret; } The vast majority of the work is still table driven so it doesn't bloat the code, but you don't have the "delay" in the command sequence since Linus didn't like it. I think something like the above would make Linus happy and I'd be OK w/ it as well. Ideally you should still make your command sequence as easy to understand as possible, kind of like how we did with _INIT_SWITCH_PAGE_CMD() in "panel-ilitek-ili9882t.c" As part of this, you'd have to add a patch to create mipi_dsi_dcs_write_cmd_seq(), but hopefully that shouldn't be too complicated? > It would be great if you could help provide a patch. Thank you so much. Sure, I can, though maybe you want to give it a shot with the above description? -Doug
Hi, Thanks reply. Doug Anderson <dianders@chromium.org> 于2024年4月24日周三 00:26写道： > > Hi, > > On Tue, Apr 23, 2024 at 2:37 AM cong yang > <yangcong5@huaqin.corp-partner.google.com> wrote: > > > > > > +static int starry_init_cmd(struct hx83102 *ctx) > > > > +{ > > > > + struct mipi_dsi_device *dsi = ctx->dsi; > > > > + > > > > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETEXTC, 0x83, 0x10, 0x21, 0x55, 0x00); > > > > + > > > > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPOWER, 0x2C, 0xB5, 0xB5, 0x31, 0xF1, 0x31, 0xD7, 0x2F, > > > > + 0x36, 0x36, 0x36, 0x36, 0x1A, 0x8B, 0x11, 0x65, 0x00, 0x88, 0xFA, 0xFF, > > > > + 0xFF, 0x8F, 0xFF, 0x08, 0x74, 0x33); > > > > > > I know this is a sticking point between Linus W. and me, but I'm > > > really not a fan of all the hardcoded function calls since it bloats > > > the code so much. I think we need to stick with something more table > > > based at least for the majority of the commands. If I understand > > > correctly, Linus was OK w/ something table based as long as it was in > > > common code [1]. I think he also wanted the "delay" out of the table, > > > but since those always seem to be at the beginning or the end it seems > > > like we could still have the majority of the code as table based. Do > > > you want to make an attempt at that? If not I can try to find some > > > time to write up a patch in the next week or so. > > > > Do you mean not add "delay" in the table? However, the delay > > required by each panel may be different. How should this be handled? > > In the case of the "himax-hx83102" driver, it looks as if all the > delays are at the beginning or end of the init sequence. That means > you could just make those extra parameters that are set per-panel and > you're back to having a simple sequence without delays. Do you mean add msleep in hx83102_enable()? @@ -612,12 +604,15 @@ static int hx83102_enable(struct drm_panel *panel) struct device *dev = &dsi->dev; int ret; + msleep(60); ret = ctx->desc->init_cmds(ctx); if (ret) { dev_err(dev, "Panel init cmds failed: %d\n", ret); return ret; } + msleep(60); + ret = mipi_dsi_dcs_exit_sleep_mode(dsi); > > If you had panels that needed delays in a more complicated way, you > could keep the per-panel functions but just make the bulk of the > function calls apply a sequence. For instance: > > static int my_panel_init_cmd(...) > { > ret = mipi_dsi_dcs_write_cmd_seq(dsi, my_panel_init_cmd_seq); > if (ret) > return ret; > mdelay(100); > ret = mipi_dsi_dcs_write(dsi, ...); > if (ret) > return ret; > mdelay(50); > ret = mipi_dsi_dcs_write_cmd_seq(dsi, ...); > if (ret) > return ret; > } > > The vast majority of the work is still table driven so it doesn't > bloat the code, but you don't have the "delay" in the command sequence > since Linus didn't like it. I think something like the above would > make Linus happy and I'd be OK w/ it as well. Ideally you should still > make your command sequence as easy to understand as possible, kind of > like how we did with _INIT_SWITCH_PAGE_CMD() in > "panel-ilitek-ili9882t.c" > > As part of this, you'd have to add a patch to create > mipi_dsi_dcs_write_cmd_seq(), but hopefully that shouldn't be too > complicated? > > > > It would be great if you could help provide a patch. Thank you so much. > > Sure, I can, though maybe you want to give it a shot with the above description? Sorry, I still don't seem to understand. How to encapsulate the parameters of "HX83102_SETDISP, HX83102_SETCYC,....."? Different parameters for each panel. I have sent my V3 but it does not contain the patch you want. > > -Doug
Hi, On Tue, Apr 23, 2024 at 7:42 PM cong yang <yangcong5@huaqin.corp-partner.google.com> wrote: > > Hi, > Thanks reply. > > Doug Anderson <dianders@chromium.org> 于2024年4月24日周三 00:26写道： > > > > Hi, > > > > On Tue, Apr 23, 2024 at 2:37 AM cong yang > > <yangcong5@huaqin.corp-partner.google.com> wrote: > > > > > > > > +static int starry_init_cmd(struct hx83102 *ctx) > > > > > +{ > > > > > + struct mipi_dsi_device *dsi = ctx->dsi; > > > > > + > > > > > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETEXTC, 0x83, 0x10, 0x21, 0x55, 0x00); > > > > > + > > > > > + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPOWER, 0x2C, 0xB5, 0xB5, 0x31, 0xF1, 0x31, 0xD7, 0x2F, > > > > > + 0x36, 0x36, 0x36, 0x36, 0x1A, 0x8B, 0x11, 0x65, 0x00, 0x88, 0xFA, 0xFF, > > > > > + 0xFF, 0x8F, 0xFF, 0x08, 0x74, 0x33); > > > > > > > > I know this is a sticking point between Linus W. and me, but I'm > > > > really not a fan of all the hardcoded function calls since it bloats > > > > the code so much. I think we need to stick with something more table > > > > based at least for the majority of the commands. If I understand > > > > correctly, Linus was OK w/ something table based as long as it was in > > > > common code [1]. I think he also wanted the "delay" out of the table, > > > > but since those always seem to be at the beginning or the end it seems > > > > like we could still have the majority of the code as table based. Do > > > > you want to make an attempt at that? If not I can try to find some > > > > time to write up a patch in the next week or so. > > > > > > Do you mean not add "delay" in the table? However, the delay > > > required by each panel may be different. How should this be handled? > > > > In the case of the "himax-hx83102" driver, it looks as if all the > > delays are at the beginning or end of the init sequence. That means > > you could just make those extra parameters that are set per-panel and > > you're back to having a simple sequence without delays. > > Do you mean add msleep in hx83102_enable()? > > @@ -612,12 +604,15 @@ static int hx83102_enable(struct drm_panel *panel) > struct device *dev = &dsi->dev; > int ret; > > + msleep(60); > ret = ctx->desc->init_cmds(ctx); > if (ret) { > dev_err(dev, "Panel init cmds failed: %d\n", ret); > return ret; > } > > + msleep(60); > + > ret = mipi_dsi_dcs_exit_sleep_mode(dsi); > > > > > If you had panels that needed delays in a more complicated way, you > > could keep the per-panel functions but just make the bulk of the > > function calls apply a sequence. For instance: > > > > static int my_panel_init_cmd(...) > > { > > ret = mipi_dsi_dcs_write_cmd_seq(dsi, my_panel_init_cmd_seq); > > if (ret) > > return ret; > > mdelay(100); > > ret = mipi_dsi_dcs_write(dsi, ...); > > if (ret) > > return ret; > > mdelay(50); > > ret = mipi_dsi_dcs_write_cmd_seq(dsi, ...); > > if (ret) > > return ret; > > } > > > > The vast majority of the work is still table driven so it doesn't > > bloat the code, but you don't have the "delay" in the command sequence > > since Linus didn't like it. I think something like the above would > > make Linus happy and I'd be OK w/ it as well. Ideally you should still > > make your command sequence as easy to understand as possible, kind of > > like how we did with _INIT_SWITCH_PAGE_CMD() in > > "panel-ilitek-ili9882t.c" > > > > As part of this, you'd have to add a patch to create > > mipi_dsi_dcs_write_cmd_seq(), but hopefully that shouldn't be too > > complicated? > > > > > > > It would be great if you could help provide a patch. Thank you so much. > > > > Sure, I can, though maybe you want to give it a shot with the above description? > > Sorry, I still don't seem to understand. How to encapsulate the parameters of > "HX83102_SETDISP, HX83102_SETCYC,....."? Different parameters for each panel. > I have sent my V3 but it does not contain the patch you want. It sounds as if Dmitry has come up with a solution that allows us to keep using the functions like you've been using but avoid the code bloat problems. ...so let's go with that. It sounds as if he's going to send a patch before too long and then it should be pretty easy to convert your patches over to use his new function. [1] https://lore.kernel.org/r/CAA8EJprv3qBd1hfdWHrfhY=S0w2O70dZnYb6TVsS6AGRPxsYdw@mail.gmail.com
diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index d037b3b8b999..eb378c897353 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -145,6 +145,15 @@ config DRM_PANEL_LVDS handling of power supplies or control signals. It implements automatic backlight handling if the panel is attached to a backlight controller. +config DRM_PANEL_HIMAX_HX83102 + tristate "himax HX83102-based panels" + depends on OF + depends on DRM_MIPI_DSI + depends on BACKLIGHT_CLASS_DEVICE + help + Say Y if you want to enable support for panels based on the + himax HX83102 controller. + config DRM_PANEL_HIMAX_HX83112A tristate "Himax HX83112A-based DSI panel" depends on OF diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index f156d7fa0bcc..8fa9e38382f6 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_DRM_PANEL_EBBG_FT8719) += panel-ebbg-ft8719.o obj-$(CONFIG_DRM_PANEL_ELIDA_KD35T133) += panel-elida-kd35t133.o obj-$(CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02) += panel-feixin-k101-im2ba02.o obj-$(CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D) += panel-feiyang-fy07024di26a30d.o +obj-$(CONFIG_DRM_PANEL_HIMAX_HX83102) += panel-himax-hx83102.o obj-$(CONFIG_DRM_PANEL_HIMAX_HX83112A) += panel-himax-hx83112a.o obj-$(CONFIG_DRM_PANEL_HIMAX_HX8394) += panel-himax-hx8394.o obj-$(CONFIG_DRM_PANEL_ILITEK_IL9322) += panel-ilitek-ili9322.o diff --git a/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c b/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c index 0ffe8f8c01de..11c1c56145c8 100644 --- a/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c +++ b/drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c @@ -1300,74 +1300,6 @@ static const struct panel_init_cmd starry_qfh032011_53g_init_cmd[] = { {}, }; -static const struct panel_init_cmd starry_himax83102_j02_init_cmd[] = { - _INIT_DCS_CMD(0xB9, 0x83, 0x10, 0x21, 0x55, 0x00), - _INIT_DCS_CMD(0xB1, 0x2C, 0xB5, 0xB5, 0x31, 0xF1, 0x31, 0xD7, 0x2F, 0x36, 0x36, 0x36, 0x36, 0x1A, 0x8B, 0x11, - 0x65, 0x00, 0x88, 0xFA, 0xFF, 0xFF, 0x8F, 0xFF, 0x08, 0x74, 0x33), - _INIT_DCS_CMD(0xB2, 0x00, 0x47, 0xB0, 0x80, 0x00, 0x12, 0x72, 0x3C, 0xA3, 0x03, 0x03, 0x00, 0x00, 0x88, 0xF5), - _INIT_DCS_CMD(0xB4, 0x76, 0x76, 0x76, 0x76, 0x76, 0x76, 0x63, 0x5C, 0x63, 0x5C, 0x01, 0x9E), - _INIT_DCS_CMD(0xE9, 0xCD), - _INIT_DCS_CMD(0xBA, 0x84), - _INIT_DCS_CMD(0xE9, 0x3F), - _INIT_DCS_CMD(0xBC, 0x1B, 0x04), - _INIT_DCS_CMD(0xBE, 0x20), - _INIT_DCS_CMD(0xBF, 0xFC, 0xC4), - _INIT_DCS_CMD(0xC0, 0x36, 0x36, 0x22, 0x11, 0x22, 0xA0, 0x61, 0x08, 0xF5, 0x03), - _INIT_DCS_CMD(0xE9, 0xCC), - _INIT_DCS_CMD(0xC7, 0x80), - _INIT_DCS_CMD(0xE9, 0x3F), - _INIT_DCS_CMD(0xE9, 0xC6), - _INIT_DCS_CMD(0xC8, 0x97), - _INIT_DCS_CMD(0xE9, 0x3F), - _INIT_DCS_CMD(0xC9, 0x00, 0x1E, 0x13, 0x88, 0x01), - _INIT_DCS_CMD(0xCB, 0x08, 0x13, 0x07, 0x00, 0x0F, 0x33), - _INIT_DCS_CMD(0xCC, 0x02), - _INIT_DCS_CMD(0xE9, 0xC4), - _INIT_DCS_CMD(0xD0, 0x03), - _INIT_DCS_CMD(0xE9, 0x3F), - _INIT_DCS_CMD(0xD1, 0x37, 0x06, 0x00, 0x02, 0x04, 0x0C, 0xFF), - _INIT_DCS_CMD(0xD2, 0x1F, 0x11, 0x1F), - _INIT_DCS_CMD(0xD3, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x08, 0x37, 0x47, 0x34, 0x3B, 0x12, 0x12, 0x03, - 0x03, 0x32, 0x10, 0x10, 0x00, 0x10, 0x32, 0x10, 0x08, 0x00, 0x08, 0x32, 0x17, 0x94, 0x07, 0x94, 0x00, 0x00), - _INIT_DCS_CMD(0xD5, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x40, 0x40, 0x1A, 0x1A, - 0x1B, 0x1B, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x20, 0x21, 0x28, 0x29, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18), - _INIT_DCS_CMD(0xD6, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x40, 0x40, 0x19, 0x19, 0x1A, 0x1A, - 0x1B, 0x1B, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x29, 0x28, 0x21, 0x20, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18), - _INIT_DCS_CMD(0xD8, 0xAA, 0xBA, 0xEA, 0xAA, 0xAA, 0xA0, 0xAA, 0xBA, 0xEA, 0xAA, 0xAA, 0xA0, 0xAA, 0xBA, 0xEA, 0xAA, - 0xAA, 0xA0, 0xAA, 0xBA, 0xEA, 0xAA, 0xAA, 0xA0, 0xAA, 0xBA, 0xEA, 0xAA, 0xAA, 0xA0, 0xAA, 0xBA, 0xEA, 0xAA, 0xAA, 0xA0), - _INIT_DCS_CMD(0xE0, 0x00, 0x09, 0x14, 0x1E, 0x26, 0x48, 0x61, 0x67, 0x6C, 0x67, 0x7D, 0x7F, 0x80, 0x8B, 0x87, 0x8F, 0x98, 0xAB, - 0xAB, 0x55, 0x5C, 0x68, 0x73, 0x00, 0x09, 0x14, 0x1E, 0x26, 0x48, 0x61, 0x67, 0x6C, 0x67, 0x7D, 0x7F, 0x80, 0x8B, 0x87, 0x8F, 0x98, 0xAB, 0xAB, 0x55, 0x5C, 0x68, 0x73), - _INIT_DCS_CMD(0xE7, 0x0E, 0x10, 0x10, 0x21, 0x2B, 0x9A, 0x02, 0x54, 0x9A, 0x14, 0x14, 0x00, 0x00, 0x00, 0x00, 0x12, 0x05, 0x02, 0x02, 0x10), - _INIT_DCS_CMD(0xBD, 0x01), - _INIT_DCS_CMD(0xB1, 0x01, 0xBF, 0x11), - _INIT_DCS_CMD(0xCB, 0x86), - _INIT_DCS_CMD(0xD2, 0x3C, 0xFA), - _INIT_DCS_CMD(0xD3, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0C, 0x01), - _INIT_DCS_CMD(0xE7, 0x02, 0x00, 0x28, 0x01, 0x7E, 0x0F, 0x7E, 0x10, 0xA0, 0x00, 0x00, 0x20, 0x40, 0x50, 0x40), - _INIT_DCS_CMD(0xBD, 0x02), - _INIT_DCS_CMD(0xD8, 0xFF, 0xFF, 0xBF, 0xFE, 0xAA, 0xA0, 0xFF, 0xFF, 0xBF, 0xFE, 0xAA, 0xA0), - _INIT_DCS_CMD(0xE7, 0xFE, 0x04, 0xFE, 0x04, 0xFE, 0x04, 0x03, 0x03, 0x03, 0x26, 0x00, 0x26, 0x81, 0x02, 0x40, 0x00, 0x20, 0x9E, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00), - _INIT_DCS_CMD(0xBD, 0x03), - _INIT_DCS_CMD(0xE9, 0xC6), - _INIT_DCS_CMD(0xB4, 0x03, 0xFF, 0xF8), - _INIT_DCS_CMD(0xE9, 0x3F), - _INIT_DCS_CMD(0xD8, 0x00, 0x2A, 0xAA, 0xA8, 0x00, 0x00, 0x00, 0x2A, 0xAA, 0xA8, 0x00, 0x00, 0x00, 0x3F, 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x3F, 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x2A, 0xAA, 0xA8, - 0x00, 0x00, 0x00, 0x2A, 0xAA, 0xA8, 0x00, 0x00), - _INIT_DCS_CMD(0xBD, 0x00), - _INIT_DCS_CMD(0xE9, 0xC4), - _INIT_DCS_CMD(0xBA, 0x96), - _INIT_DCS_CMD(0xE9, 0x3F), - _INIT_DCS_CMD(0xBD, 0x01), - _INIT_DCS_CMD(0xE9, 0xC5), - _INIT_DCS_CMD(0xBA, 0x4F), - _INIT_DCS_CMD(0xE9, 0x3F), - _INIT_DCS_CMD(0xBD, 0x00), - _INIT_DCS_CMD(0x11), - _INIT_DELAY_CMD(120), - _INIT_DCS_CMD(0x29), - {}, -}; - static inline struct boe_panel *to_boe_panel(struct drm_panel *panel) { return container_of(panel, struct boe_panel, base); @@ -1767,34 +1699,6 @@ static const struct panel_desc starry_qfh032011_53g_desc = { .lp11_before_reset = true, }; -static const struct drm_display_mode starry_himax83102_j02_default_mode = { - .clock = 162680, - .hdisplay = 1200, - .hsync_start = 1200 + 60, - .hsync_end = 1200 + 60 + 20, - .htotal = 1200 + 60 + 20 + 40, - .vdisplay = 1920, - .vsync_start = 1920 + 116, - .vsync_end = 1920 + 116 + 8, - .vtotal = 1920 + 116 + 8 + 12, - .type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, -}; - -static const struct panel_desc starry_himax83102_j02_desc = { - .modes = &starry_himax83102_j02_default_mode, - .bpc = 8, - .size = { - .width_mm = 141, - .height_mm = 226, - }, - .lanes = 4, - .format = MIPI_DSI_FMT_RGB888, - .mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE | - MIPI_DSI_MODE_LPM, - .init_cmds = starry_himax83102_j02_init_cmd, - .lp11_before_reset = true, -}; - static int boe_panel_get_modes(struct drm_panel *panel, struct drm_connector *connector) { @@ -1970,9 +1874,6 @@ static const struct of_device_id boe_of_match[] = { { .compatible = "starry,2081101qfh032011-53g", .data = &starry_qfh032011_53g_desc }, - { .compatible = "starry,himax83102-j02", - .data = &starry_himax83102_j02_desc - }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, boe_of_match); diff --git a/drivers/gpu/drm/panel/panel-himax-hx83102.c b/drivers/gpu/drm/panel/panel-himax-hx83102.c new file mode 100644 index 000000000000..ac8329f89195 --- /dev/null +++ b/drivers/gpu/drm/panel/panel-himax-hx83102.c @@ -0,0 +1,567 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Driver for panels based on Himax HX83102 controller, such as: + * + * - Starry 10.51" WUXGA MIPI-DSI panel + * + * Based on drivers/gpu/drm/panel/panel-boe-tv101wum.c + */ + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/regulator/consumer.h> + +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_panel.h> + +#include <video/mipi_display.h> + +#define DRV_NAME "panel-himax-hx83102" + +/* Manufacturer specific DSI commands */ +#define HX83102_SETPOWER 0xb1 +#define HX83102_SETDISP 0xb2 +#define HX83102_SETCYC 0xb4 +#define HX83102_SETEXTC 0xb9 +#define HX83102_SETMIPI 0xba +#define HX83102_SETVDC 0xbc +#define HX83102_SETBANK 0xbd +#define HX83102_UNKNOWN1 0xbe +#define HX83102_SETPTBA 0xbf +#define HX83102_SETSTBA 0xc0 +#define HX83102_SETTCON 0xc7 +#define HX83102_SETRAMDMY 0xc8 +#define HX83102_SETPWM 0xc9 +#define HX83102_SETCLOCK 0xcb +#define HX83102_SETPANEL 0xcc +#define HX83102_SETCASCADE 0xd0 +#define HX83102_SETPCTRL 0xd1 +#define HX83102_UNKNOWN2 0xd2 +#define HX83102_SETGIP0 0xd3 +#define HX83102_SETGIP1 0xd5 +#define HX83102_UNKNOWN3 0xd6 +#define HX83102_SETGIP3 0xd8 +#define HX83102_UNKNOWN4 0xe0 +#define HX83102_SETTP1 0xe7 +#define HX83102_SETSPCCMD 0xe9 + +struct hx83102 { + struct drm_panel base; + struct mipi_dsi_device *dsi; + + const struct hx83102_panel_desc *desc; + + enum drm_panel_orientation orientation; + struct regulator *pp1800; + struct regulator *avee; + struct regulator *avdd; + struct gpio_desc *enable_gpio; + + bool prepared; +}; + +struct hx83102_panel_desc { + const struct drm_display_mode *modes; + unsigned int bpc; + + /** + * @width_mm: width of the panel's active display area + * @height_mm: height of the panel's active display area + */ + struct { + unsigned int width_mm; + unsigned int height_mm; + } size; + + unsigned long mode_flags; + enum mipi_dsi_pixel_format format; + unsigned int lanes; + bool lp11_before_reset; + int (*init_cmds)(struct hx83102 *ctx); +}; + +static inline struct hx83102 *panel_to_hx83102(struct drm_panel *panel) +{ + return container_of(panel, struct hx83102, base); +} + +static int starry_init_cmd(struct hx83102 *ctx) +{ + struct mipi_dsi_device *dsi = ctx->dsi; + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETEXTC, 0x83, 0x10, 0x21, 0x55, 0x00); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPOWER, 0x2C, 0xB5, 0xB5, 0x31, 0xF1, 0x31, 0xD7, 0x2F, + 0x36, 0x36, 0x36, 0x36, 0x1A, 0x8B, 0x11, 0x65, 0x00, 0x88, 0xFA, 0xFF, + 0xFF, 0x8F, 0xFF, 0x08, 0x74, 0x33); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETDISP, 0x00, 0x47, 0xB0, 0x80, 0x00, 0x12, 0x72, 0x3C, + 0xA3, 0x03, 0x03, 0x00, 0x00, 0x88, 0xF5); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETCYC, 0x76, 0x76, 0x76, 0x76, 0x76, 0x76, 0x63, 0x5C, + 0x63, 0x5C, 0x01, 0x9E); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0xCD); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETMIPI, 0x84); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0x3F); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETVDC, 0x1B, 0x04); + + mipi_dsi_dcs_write_seq(dsi, HX83102_UNKNOWN1, 0x20); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPTBA, 0xFC, 0xC4); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSTBA, 0x36, 0x36, 0x22, 0x11, 0x22, 0xA0, 0x61, 0x08, + 0xF5, 0x03); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0xCC); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETTCON, 0x80); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0x3F); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0xC6); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETRAMDMY, 0x97); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0x3F); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPWM, 0x00, 0x1E, 0x13, 0x88, 0x01); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETCLOCK, 0x08, 0x13, 0x07, 0x00, 0x0F, 0x33); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPANEL, 0x02); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0xC4); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETCASCADE, 0x03); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0x3F); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPCTRL, 0x37, 0x06, 0x00, 0x02, 0x04, 0x0C, 0xFF); + + mipi_dsi_dcs_write_seq(dsi, HX83102_UNKNOWN2, 0x1F, 0x11, 0x1F); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETGIP0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, + 0x08, 0x37, 0x47, 0x34, 0x3B, 0x12, 0x12, 0x03, 0x03, 0x32, 0x10, 0x10, + 0x00, 0x10, 0x32, 0x10, 0x08, 0x00, 0x08, 0x32, 0x17, 0x94, 0x07, 0x94, + 0x00, 0x00); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETGIP1, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x19, 0x19, 0x40, 0x40, 0x1A, 0x1A, 0x1B, 0x1B, 0x00, 0x01, + 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x20, 0x21, 0x28, 0x29, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18); + + mipi_dsi_dcs_write_seq(dsi, HX83102_UNKNOWN3, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x40, 0x40, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x07, 0x06, + 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x29, 0x28, 0x21, 0x20, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETGIP3, 0xAA, 0xBA, 0xEA, 0xAA, 0xAA, 0xA0, 0xAA, 0xBA, + 0xEA, 0xAA, 0xAA, 0xA0, 0xAA, 0xBA, 0xEA, 0xAA, 0xAA, 0xA0, 0xAA, 0xBA, + 0xEA, 0xAA, 0xAA, 0xA0, 0xAA, 0xBA, 0xEA, 0xAA, 0xAA, 0xA0, 0xAA, 0xBA, + 0xEA, 0xAA, 0xAA, 0xA0); + + mipi_dsi_dcs_write_seq(dsi, HX83102_UNKNOWN4, 0x00, 0x09, 0x14, 0x1E, 0x26, 0x48, 0x61, 0x67, + 0x6C, 0x67, 0x7D, 0x7F, 0x80, 0x8B, 0x87, 0x8F, 0x98, 0xAB, 0xAB, 0x55, + 0x5C, 0x68, 0x73, 0x00, 0x09, 0x14, 0x1E, 0x26, 0x48, 0x61, 0x67, 0x6C, + 0x67, 0x7D, 0x7F, 0x80, 0x8B, 0x87, 0x8F, 0x98, 0xAB, 0xAB, 0x55, 0x5C, + 0x68, 0x73); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETTP1, 0x0E, 0x10, 0x10, 0x21, 0x2B, 0x9A, 0x02, 0x54, + 0x9A, 0x14, 0x14, 0x00, 0x00, 0x00, 0x00, 0x12, 0x05, 0x02, 0x02, 0x10); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETBANK, 0x01); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETPOWER, 0x01, 0xBF, 0x11); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETCLOCK, 0x86); + + mipi_dsi_dcs_write_seq(dsi, HX83102_UNKNOWN2, 0x3C, 0xFA); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETGIP0, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x0C, 0x01); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETTP1, 0x02, 0x00, 0x28, 0x01, 0x7E, 0x0F, 0x7E, 0x10, + 0xA0, 0x00, 0x00, 0x20, 0x40, 0x50, 0x40); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETBANK, 0x02); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETGIP3, 0xFF, 0xFF, 0xBF, 0xFE, 0xAA, 0xA0, 0xFF, 0xFF, + 0xBF, 0xFE, 0xAA, 0xA0); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETTP1, 0xFE, 0x04, 0xFE, 0x04, 0xFE, 0x04, 0x03, 0x03, + 0x03, 0x26, 0x00, 0x26, 0x81, 0x02, 0x40, 0x00, 0x20, 0x9E, 0x04, 0x03, + 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETBANK, 0x03); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0xC6); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETCYC, 0x03, 0xFF, 0xF8); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0x3F); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETGIP3, 0x00, 0x2A, 0xAA, 0xA8, 0x00, 0x00, 0x00, 0x2A, + 0xAA, 0xA8, 0x00, 0x00, 0x00, 0x3F, 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x3F, + 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x2A, 0xAA, 0xA8, 0x00, 0x00, 0x00, 0x2A, + 0xAA, 0xA8, 0x00, 0x00); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETBANK, 0x00); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0xC4); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETMIPI, 0x96); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0x3F); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETBANK, 0x01); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0xC5); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETMIPI, 0x4F); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETSPCCMD, 0x3F); + + mipi_dsi_dcs_write_seq(dsi, HX83102_SETBANK, 0x00); + + return 0; +}; + +static const struct drm_display_mode starry_mode = { + .clock = 162680, + .hdisplay = 1200, + .hsync_start = 1200 + 60, + .hsync_end = 1200 + 60 + 20, + .htotal = 1200 + 60 + 20 + 40, + .vdisplay = 1920, + .vsync_start = 1920 + 116, + .vsync_end = 1920 + 116 + 8, + .vtotal = 1920 + 116 + 8 + 12, + .type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, +}; + +static const struct hx83102_panel_desc starry_desc = { + .modes = &starry_mode, + .bpc = 8, + .size = { + .width_mm = 141, + .height_mm = 226, + }, + .lanes = 4, + .format = MIPI_DSI_FMT_RGB888, + .mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE | + MIPI_DSI_MODE_LPM, + .init_cmds = starry_init_cmd, + .lp11_before_reset = true, +}; + +static int hx83102_enable(struct drm_panel *panel) +{ + struct hx83102 *ctx = panel_to_hx83102(panel); + struct mipi_dsi_device *dsi = ctx->dsi; + struct device *dev = &dsi->dev; + int ret; + + ret = ctx->desc->init_cmds(ctx); + if (ret) { + dev_err(dev, "Panel init cmds failed: %d\n", ret); + return ret; + } + + ret = mipi_dsi_dcs_exit_sleep_mode(dsi); + if (ret) { + dev_err(dev, "Failed to exit sleep mode: %d\n", ret); + return ret; + } + + msleep(120); + + ret = mipi_dsi_dcs_set_display_on(dsi); + if (ret) { + dev_err(dev, "Failed to turn on the display: %d\n", ret); + goto sleep_in; + } + + msleep(130); + + return 0; + +sleep_in: + ret = mipi_dsi_dcs_enter_sleep_mode(dsi); + if (!ret) + msleep(50); + + return ret; +} + +static int hx83102_panel_enter_sleep_mode(struct hx83102 *ctx) +{ + struct mipi_dsi_device *dsi = ctx->dsi; + int ret; + + dsi->mode_flags &= ~MIPI_DSI_MODE_LPM; + + ret = mipi_dsi_dcs_set_display_off(dsi); + if (ret < 0) + return ret; + + ret = mipi_dsi_dcs_enter_sleep_mode(dsi); + if (ret < 0) + return ret; + + return 0; +} + +static int hx83102_disable(struct drm_panel *panel) +{ + struct hx83102 *ctx = panel_to_hx83102(panel); + struct mipi_dsi_device *dsi = ctx->dsi; + struct device *dev = &dsi->dev; + int ret; + + ret = hx83102_panel_enter_sleep_mode(ctx); + if (ret < 0) { + dev_err(dev, "failed to set panel off: %d\n", ret); + return ret; + } + + msleep(150); + + return 0; +} + +static int hx83102_unprepare(struct drm_panel *panel) +{ + struct hx83102 *ctx = panel_to_hx83102(panel); + + if (!ctx->prepared) + return 0; + + gpiod_set_value(ctx->enable_gpio, 0); + usleep_range(1000, 2000); + regulator_disable(ctx->avee); + regulator_disable(ctx->avdd); + usleep_range(5000, 7000); + regulator_disable(ctx->pp1800); + + ctx->prepared = false; + + return 0; +} + +static int hx83102_prepare(struct drm_panel *panel) +{ + struct hx83102 *ctx = panel_to_hx83102(panel); + int ret; + + + if (ctx->prepared) + return 0; + + gpiod_set_value(ctx->enable_gpio, 0); + usleep_range(1000, 1500); + + ret = regulator_enable(ctx->pp1800); + if (ret < 0) + return ret; + + usleep_range(3000, 5000); + + ret = regulator_enable(ctx->avdd); + if (ret < 0) + goto poweroff1v8; + ret = regulator_enable(ctx->avee); + if (ret < 0) + goto poweroffavdd; + + usleep_range(10000, 11000); + + if (ctx->desc->lp11_before_reset) { + mipi_dsi_dcs_nop(ctx->dsi); + usleep_range(1000, 2000); + } + gpiod_set_value(ctx->enable_gpio, 1); + usleep_range(1000, 2000); + gpiod_set_value(ctx->enable_gpio, 0); + usleep_range(1000, 2000); + gpiod_set_value(ctx->enable_gpio, 1); + usleep_range(6000, 10000); + + ctx->prepared = true; + + return 0; + +poweroffavdd: + regulator_disable(ctx->avdd); +poweroff1v8: + usleep_range(5000, 7000); + regulator_disable(ctx->pp1800); + gpiod_set_value(ctx->enable_gpio, 0); + + return ret; +} + +static int hx83102_get_modes(struct drm_panel *panel, + struct drm_connector *connector) +{ + struct hx83102 *ctx = panel_to_hx83102(panel); + const struct drm_display_mode *m = ctx->desc->modes; + struct drm_display_mode *mode; + + mode = drm_mode_duplicate(connector->dev, m); + if (!mode) { + dev_err(panel->dev, "failed to add mode %ux%u@%u\n", + m->hdisplay, m->vdisplay, drm_mode_vrefresh(m)); + return -ENOMEM; + } + + mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; + drm_mode_set_name(mode); + drm_mode_probed_add(connector, mode); + + connector->display_info.width_mm = ctx->desc->size.width_mm; + connector->display_info.height_mm = ctx->desc->size.height_mm; + connector->display_info.bpc = ctx->desc->bpc; + /* + * TODO: Remove once all drm drivers call + * drm_connector_set_orientation_from_panel() + */ + drm_connector_set_panel_orientation(connector, ctx->orientation); + + return 1; +} + +static enum drm_panel_orientation hx83102_get_orientation(struct drm_panel *panel) +{ + struct hx83102 *ctx = panel_to_hx83102(panel); + + return ctx->orientation; +} + +static const struct drm_panel_funcs hx83102_drm_funcs = { + .disable = hx83102_disable, + .unprepare = hx83102_unprepare, + .prepare = hx83102_prepare, + .enable = hx83102_enable, + .get_modes = hx83102_get_modes, + .get_orientation = hx83102_get_orientation, +}; + +static int hx83102_panel_add(struct hx83102 *ctx) +{ + struct device *dev = &ctx->dsi->dev; + int err; + + ctx->avdd = devm_regulator_get(dev, "avdd"); + if (IS_ERR(ctx->avdd)) + return PTR_ERR(ctx->avdd); + + ctx->avee = devm_regulator_get(dev, "avee"); + if (IS_ERR(ctx->avee)) + return PTR_ERR(ctx->avee); + + ctx->pp1800 = devm_regulator_get(dev, "pp1800"); + if (IS_ERR(ctx->pp1800)) + return PTR_ERR(ctx->pp1800); + + ctx->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW); + if (IS_ERR(ctx->enable_gpio)) { + dev_err(dev, "cannot get reset-gpios %ld\n", + PTR_ERR(ctx->enable_gpio)); + return PTR_ERR(ctx->enable_gpio); + } + + gpiod_set_value(ctx->enable_gpio, 0); + + ctx->base.prepare_prev_first = true; + + drm_panel_init(&ctx->base, dev, &hx83102_drm_funcs, + DRM_MODE_CONNECTOR_DSI); + err = of_drm_get_panel_orientation(dev->of_node, &ctx->orientation); + if (err < 0) { + dev_err(dev, "%pOF: failed to get orientation %d\n", dev->of_node, err); + return err; + } + + err = drm_panel_of_backlight(&ctx->base); + if (err) + return err; + + ctx->base.funcs = &hx83102_drm_funcs; + ctx->base.dev = &ctx->dsi->dev; + + drm_panel_add(&ctx->base); + + return 0; +} + +static int hx83102_probe(struct mipi_dsi_device *dsi) +{ + struct hx83102 *ctx; + int ret; + const struct hx83102_panel_desc *desc; + + ctx = devm_kzalloc(&dsi->dev, sizeof(*ctx), GFP_KERNEL); + if (!ctx) + return -ENOMEM; + + desc = of_device_get_match_data(&dsi->dev); + dsi->lanes = desc->lanes; + dsi->format = desc->format; + dsi->mode_flags = desc->mode_flags; + ctx->desc = desc; + ctx->dsi = dsi; + ret = hx83102_panel_add(ctx); + if (ret < 0) + return ret; + + mipi_dsi_set_drvdata(dsi, ctx); + + ret = mipi_dsi_attach(dsi); + if (ret) + drm_panel_remove(&ctx->base); + + return ret; +} + +static void hx83102_remove(struct mipi_dsi_device *dsi) +{ + struct hx83102 *ctx = mipi_dsi_get_drvdata(dsi); + int ret; + + ret = mipi_dsi_detach(dsi); + if (ret < 0) + dev_err(&dsi->dev, "failed to detach from DSI host: %d\n", ret); + + if (ctx->base.dev) + drm_panel_remove(&ctx->base); +} + +static const struct of_device_id hx83102_of_match[] = { + { .compatible = "starry,himax83102-j02", + .data = &starry_desc + }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, hx83102_of_match); + +static struct mipi_dsi_driver hx83102_driver = { + .probe = hx83102_probe, + .remove = hx83102_remove, + .driver = { + .name = DRV_NAME, + .of_match_table = hx83102_of_match, + }, +}; +module_mipi_dsi_driver(hx83102_driver); + +MODULE_AUTHOR("Cong Yang <yangcong5@huaqin.corp-partner.google.com>"); +MODULE_DESCRIPTION("DRM driver for Himax HX83102 based MIPI DSI panels"); +MODULE_LICENSE("GPL");
The Starry HX83102 based mipi panel should never have been part of the boe tv101wum driver. Discussion with Doug and Linus in V1 [1], we need a separate driver to enable the hx83102 controller. In hx83102 driver, add DSI commands as macros. So it can add some panels with same control model in the future. [1]: https://lore.kernel.org/all/CACRpkdbzYZAS0=zBQJUC4CB2wj4s1h6n6aSAZQvdMV95r3zRUw@mail.gmail.com Signed-off-by: Cong Yang <yangcong5@huaqin.corp-partner.google.com> --- drivers/gpu/drm/panel/Kconfig | 9 + drivers/gpu/drm/panel/Makefile | 1 + .../gpu/drm/panel/panel-boe-tv101wum-nl6.c | 99 --- drivers/gpu/drm/panel/panel-himax-hx83102.c | 567 ++++++++++++++++++ 4 files changed, 577 insertions(+), 99 deletions(-) create mode 100644 drivers/gpu/drm/panel/panel-himax-hx83102.c