* [PATCH v3 0/2] Add driver for Raydium RM69380-based DSI panels
@ 2024-04-16 18:30 David Wronek
2024-04-16 18:30 ` [PATCH v3 1/2] dt-bindings: display: panel: Add Raydium RM69380 David Wronek
2024-04-16 18:30 ` [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel David Wronek
0 siblings, 2 replies; 9+ messages in thread
From: David Wronek @ 2024-04-16 18:30 UTC (permalink / raw)
To: Neil Armstrong, Jessica Zhang, Sam Ravnborg, Daniel Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Marijn Suijten, Konrad Dybcio
Cc: dri-devel, devicetree, linux-kernel, ~postmarketos/upstreaming,
phone-devel, David Wronek
This patch adds support the 2560x1600@90Hz dual DSI command mode panel by
EDO in combination with a Raydium RM69380 driver IC.
This driver IC can be found in the following devices:
* Lenovo Xiaoxin Pad Pro 2021 (TB-J716F) with EDO panel
* Lenovo Tab P11 Pro (TB-J706F) with EDO panel
* Robo & Kala 2-in-1 Laptop with Sharp panel
Signed-off-by: David Wronek <david@mainlining.org>
---
Changes in v3:
- Removed unneeded curly brackets from some if statments
- Fix error handling code in probe function
- Include video/mipi_display.h and make use of MIPI command definitions
- Removed DRM_MODE_TYPE_PREFERRED
- Dropped 'prepared' bool entirely
- Register second DSI host using mipi_dsi_device_register_full()
- Link to v2: https://lore.kernel.org/r/20240415-raydium-rm69380-driver-v2-0-524216461306@mainlining.org
Changes in v2:
- Fixed typo in Kconfig
- Removed ctx->prepared = true; in prepare function
- Switched to drm_connector_helper_get_modes_fixed in get_modes function
- Changed dev_notice() to dev_dbg()
- Add description for compatible and reset-gpio in the dt-binding
- Always require 'ports' node in the dt-binding regardless of compatible
- Link to v1: https://lore.kernel.org/r/20240414-raydium-rm69380-driver-v1-0-5e86ba2490b5@mainlining.org
---
David Wronek (2):
dt-bindings: display: panel: Add Raydium RM69380
drm/panel: Add driver for EDO RM69380 OLED panel
.../bindings/display/panel/raydium,rm69380.yaml | 91 +++++
drivers/gpu/drm/panel/Kconfig | 14 +
drivers/gpu/drm/panel/Makefile | 1 +
drivers/gpu/drm/panel/panel-raydium-rm69380.c | 367 +++++++++++++++++++++
4 files changed, 473 insertions(+)
---
base-commit: 66e4190e92ce0e4a50b2f6be0e5f5b2e47e072f4
change-id: 20240414-raydium-rm69380-driver-47f22b6f24fe
Best regards,
--
David Wronek <david@mainlining.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 1/2] dt-bindings: display: panel: Add Raydium RM69380
2024-04-16 18:30 [PATCH v3 0/2] Add driver for Raydium RM69380-based DSI panels David Wronek
@ 2024-04-16 18:30 ` David Wronek
2024-04-16 19:20 ` Rob Herring
2024-04-17 14:40 ` Rob Herring
2024-04-16 18:30 ` [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel David Wronek
1 sibling, 2 replies; 9+ messages in thread
From: David Wronek @ 2024-04-16 18:30 UTC (permalink / raw)
To: Neil Armstrong, Jessica Zhang, Sam Ravnborg, Daniel Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Marijn Suijten, Konrad Dybcio
Cc: dri-devel, devicetree, linux-kernel, ~postmarketos/upstreaming,
phone-devel, David Wronek
Raydium RM69380 is a display driver IC used to drive OLED DSI panels.
Add a dt-binding for it.
Signed-off-by: David Wronek <david@mainlining.org>
---
Note:
Depends on commit 48a516363e29 ("dt-bindings: display: panel: add common dual-link schema")
---
.../bindings/display/panel/raydium,rm69380.yaml | 91 ++++++++++++++++++++++
1 file changed, 91 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml b/Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml
new file mode 100644
index 000000000000..0ac7d033cbe0
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml
@@ -0,0 +1,91 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/panel/raydium,rm69380.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Raydium RM6380-based DSI display panels
+
+maintainers:
+ - David Wronek <david@mainlining.org>
+
+description:
+ The Raydium RM69380 is a generic DSI panel IC used to control
+ OLED panels.
+
+allOf:
+ - $ref: panel-common-dual.yaml#
+
+properties:
+ compatible:
+ items:
+ - enum:
+ - lenovo,j716f-edo-rm69380
+ - const: raydium,rm69380
+ description: This indicates the panel manufacturer of the panel
+ that is in turn using the RM69380 panel driver. The compatible
+ string determines how the RM69380 panel driver shall be configured
+ to work with the indicated panel. The raydium,rm69380 compatible shall
+ always be provided as a fallback.
+
+ avdd-supply:
+ description: Analog voltage rail
+
+ vddio-supply:
+ description: I/O voltage rail
+
+ reset-gpios:
+ maxItems: 1
+ description: phandle of gpio for reset line - This should be active low
+
+ ports: true
+ reg: true
+
+required:
+ - compatible
+ - reg
+ - avdd-supply
+ - vddio-supply
+ - reset-gpios
+ - ports
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/gpio/gpio.h>
+
+ dsi {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ panel@0 {
+ compatible = "lenovo,j716f-edo-rm69380", "raydium,rm69380";
+ reg = <0>;
+
+ avdd-supply = <&panel_avdd_regulator>;
+ vddio-supply = <&vreg_l14a>;
+ reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ panel_in_0: endpoint {
+ remote-endpoint = <&mdss_dsi0_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ panel_in_1: endpoint {
+ remote-endpoint = <&mdss_dsi1_out>;
+ };
+ };
+ };
+ };
+ };
+
+...
--
2.44.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel
2024-04-16 18:30 [PATCH v3 0/2] Add driver for Raydium RM69380-based DSI panels David Wronek
2024-04-16 18:30 ` [PATCH v3 1/2] dt-bindings: display: panel: Add Raydium RM69380 David Wronek
@ 2024-04-16 18:30 ` David Wronek
2024-04-16 20:06 ` Dmitry Baryshkov
` (2 more replies)
1 sibling, 3 replies; 9+ messages in thread
From: David Wronek @ 2024-04-16 18:30 UTC (permalink / raw)
To: Neil Armstrong, Jessica Zhang, Sam Ravnborg, Daniel Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Marijn Suijten, Konrad Dybcio
Cc: dri-devel, devicetree, linux-kernel, ~postmarketos/upstreaming,
phone-devel, David Wronek
Add support for the 2560x1600@90Hz OLED panel by EDO bundled with a
Raydium RM69380 controller, as found on the Lenovo Xiaoxin Pad Pro 2021.
Signed-off-by: David Wronek <david@mainlining.org>
---
drivers/gpu/drm/panel/Kconfig | 14 +
drivers/gpu/drm/panel/Makefile | 1 +
drivers/gpu/drm/panel/panel-raydium-rm69380.c | 367 ++++++++++++++++++++++++++
3 files changed, 382 insertions(+)
diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
index 154f5bf82980..5b3eeb93b1a2 100644
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -542,6 +542,20 @@ config DRM_PANEL_RAYDIUM_RM692E5
Say Y here if you want to enable support for Raydium RM692E5-based
display panels, such as the one found in the Fairphone 5 smartphone.
+config DRM_PANEL_RAYDIUM_RM69380
+ tristate "Raydium RM69380-based DSI panel"
+ depends on BACKLIGHT_CLASS_DEVICE
+ depends on DRM_DISPLAY_DP_HELPER
+ depends on DRM_DISPLAY_HELPER
+ depends on DRM_MIPI_DSI
+ depends on OF
+ help
+ Say Y here if you want to enable support for Raydium RM69380-based
+ display panels.
+
+ This panel controller can be found in the Lenovo Xiaoxin Pad Pro 2021
+ in combination with an EDO OLED panel.
+
config DRM_PANEL_RONBO_RB070D30
tristate "Ronbo Electronics RB070D30 panel"
depends on OF
diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
index 24a02655d726..e2a2807d4ef0 100644
--- a/drivers/gpu/drm/panel/Makefile
+++ b/drivers/gpu/drm/panel/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN) += panel-raspberrypi-touchscreen
obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM67191) += panel-raydium-rm67191.o
obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM68200) += panel-raydium-rm68200.o
obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM692E5) += panel-raydium-rm692e5.o
+obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM69380) += panel-raydium-rm69380.o
obj-$(CONFIG_DRM_PANEL_RONBO_RB070D30) += panel-ronbo-rb070d30.o
obj-$(CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20) += panel-samsung-atna33xc20.o
obj-$(CONFIG_DRM_PANEL_SAMSUNG_DB7430) += panel-samsung-db7430.o
diff --git a/drivers/gpu/drm/panel/panel-raydium-rm69380.c b/drivers/gpu/drm/panel/panel-raydium-rm69380.c
new file mode 100644
index 000000000000..f89230c969b7
--- /dev/null
+++ b/drivers/gpu/drm/panel/panel-raydium-rm69380.c
@@ -0,0 +1,367 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Generated with linux-mdss-dsi-panel-driver-generator from vendor device tree.
+ * Copyright (c) 2024 David Wronek <david@mainlining.org>
+ */
+
+#include <linux/backlight.h>
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_graph.h>
+#include <linux/regulator/consumer.h>
+
+#include <video/mipi_display.h>
+
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_modes.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_probe_helper.h>
+
+struct rm69380_panel {
+ struct drm_panel panel;
+ struct mipi_dsi_device *dsi[2];
+ struct regulator_bulk_data supplies[2];
+ struct gpio_desc *reset_gpio;
+};
+
+static inline
+struct rm69380_panel *to_rm69380_panel(struct drm_panel *panel)
+{
+ return container_of(panel, struct rm69380_panel, panel);
+}
+
+static void rm69380_reset(struct rm69380_panel *ctx)
+{
+ gpiod_set_value_cansleep(ctx->reset_gpio, 0);
+ usleep_range(15000, 16000);
+ gpiod_set_value_cansleep(ctx->reset_gpio, 1);
+ usleep_range(10000, 11000);
+ gpiod_set_value_cansleep(ctx->reset_gpio, 0);
+ msleep(30);
+}
+
+static int rm69380_on(struct rm69380_panel *ctx)
+{
+ struct mipi_dsi_device *dsi = ctx->dsi[0];
+ struct device *dev = &dsi->dev;
+ int ret;
+
+ dsi->mode_flags |= MIPI_DSI_MODE_LPM;
+ if (ctx->dsi[1])
+ ctx->dsi[1]->mode_flags |= MIPI_DSI_MODE_LPM;
+
+ mipi_dsi_dcs_write_seq(dsi, 0xfe, 0xd4);
+ mipi_dsi_dcs_write_seq(dsi, 0x00, 0x80);
+ mipi_dsi_dcs_write_seq(dsi, 0xfe, 0xd0);
+ mipi_dsi_dcs_write_seq(dsi, 0x48, 0x00);
+ mipi_dsi_dcs_write_seq(dsi, 0xfe, 0x26);
+ mipi_dsi_dcs_write_seq(dsi, 0x75, 0x3f);
+ mipi_dsi_dcs_write_seq(dsi, 0x1d, 0x1a);
+ mipi_dsi_dcs_write_seq(dsi, 0xfe, 0x00);
+ mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, 0x28);
+ mipi_dsi_dcs_write_seq(dsi, 0xc2, 0x08);
+
+ ret = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
+ if (ret < 0) {
+ dev_err(dev, "Failed to set tear on: %d\n", ret);
+ return ret;
+ }
+
+ ret = mipi_dsi_dcs_set_display_brightness(dsi, 0x7ff);
+ if (ret < 0) {
+ dev_err(dev, "Failed to set display brightness: %d\n", ret);
+ return ret;
+ }
+
+ ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
+ if (ret < 0) {
+ dev_err(dev, "Failed to exit sleep mode: %d\n", ret);
+ return ret;
+ }
+ msleep(20);
+
+ ret = mipi_dsi_dcs_set_display_on(dsi);
+ if (ret < 0) {
+ dev_err(dev, "Failed to set display on: %d\n", ret);
+ return ret;
+ }
+ msleep(36);
+
+ return 0;
+}
+
+static int rm69380_off(struct rm69380_panel *ctx)
+{
+ struct mipi_dsi_device *dsi = ctx->dsi[0];
+ struct device *dev = &dsi->dev;
+ int ret;
+
+ dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
+ if (ctx->dsi[1])
+ ctx->dsi[1]->mode_flags &= ~MIPI_DSI_MODE_LPM;
+
+ ret = mipi_dsi_dcs_set_display_off(dsi);
+ if (ret < 0) {
+ dev_err(dev, "Failed to set display off: %d\n", ret);
+ return ret;
+ }
+ msleep(35);
+
+ ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
+ if (ret < 0) {
+ dev_err(dev, "Failed to enter sleep mode: %d\n", ret);
+ return ret;
+ }
+ msleep(20);
+
+ return 0;
+}
+
+static int rm69380_prepare(struct drm_panel *panel)
+{
+ struct rm69380_panel *ctx = to_rm69380_panel(panel);
+ struct device *dev = &ctx->dsi[0]->dev;
+ int ret;
+
+ ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
+ if (ret < 0) {
+ dev_err(dev, "Failed to enable regulators: %d\n", ret);
+ return ret;
+ }
+
+ rm69380_reset(ctx);
+
+ ret = rm69380_on(ctx);
+ if (ret < 0) {
+ dev_err(dev, "Failed to initialize panel: %d\n", ret);
+ gpiod_set_value_cansleep(ctx->reset_gpio, 1);
+ regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int rm69380_unprepare(struct drm_panel *panel)
+{
+ struct rm69380_panel *ctx = to_rm69380_panel(panel);
+ struct device *dev = &ctx->dsi[0]->dev;
+ int ret;
+
+ ret = rm69380_off(ctx);
+ if (ret < 0)
+ dev_err(dev, "Failed to un-initialize panel: %d\n", ret);
+
+ gpiod_set_value_cansleep(ctx->reset_gpio, 1);
+ regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
+
+ return 0;
+}
+
+static const struct drm_display_mode rm69380_mode = {
+ .clock = (2560 + 32 + 12 + 38) * (1600 + 20 + 4 + 8) * 90 / 1000,
+ .hdisplay = 2560,
+ .hsync_start = 2560 + 32,
+ .hsync_end = 2560 + 32 + 12,
+ .htotal = 2560 + 32 + 12 + 38,
+ .vdisplay = 1600,
+ .vsync_start = 1600 + 20,
+ .vsync_end = 1600 + 20 + 4,
+ .vtotal = 1600 + 20 + 4 + 8,
+ .width_mm = 248,
+ .height_mm = 155,
+ .type = DRM_MODE_TYPE_DRIVER,
+};
+
+static int rm69380_get_modes(struct drm_panel *panel,
+ struct drm_connector *connector)
+{
+ return drm_connector_helper_get_modes_fixed(connector, &rm69380_mode);
+}
+
+static const struct drm_panel_funcs rm69380_panel_funcs = {
+ .prepare = rm69380_prepare,
+ .unprepare = rm69380_unprepare,
+ .get_modes = rm69380_get_modes,
+};
+
+static int rm69380_bl_update_status(struct backlight_device *bl)
+{
+ struct mipi_dsi_device *dsi = bl_get_data(bl);
+ u16 brightness = backlight_get_brightness(bl);
+ int ret;
+
+ dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
+
+ ret = mipi_dsi_dcs_set_display_brightness_large(dsi, brightness);
+ if (ret < 0)
+ return ret;
+
+ dsi->mode_flags |= MIPI_DSI_MODE_LPM;
+
+ return 0;
+}
+
+static int rm69380_bl_get_brightness(struct backlight_device *bl)
+{
+ struct mipi_dsi_device *dsi = bl_get_data(bl);
+ u16 brightness;
+ int ret;
+
+ dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
+
+ ret = mipi_dsi_dcs_get_display_brightness_large(dsi, &brightness);
+ if (ret < 0)
+ return ret;
+
+ dsi->mode_flags |= MIPI_DSI_MODE_LPM;
+
+ return brightness;
+}
+
+static const struct backlight_ops rm69380_bl_ops = {
+ .update_status = rm69380_bl_update_status,
+ .get_brightness = rm69380_bl_get_brightness,
+};
+
+static struct backlight_device *
+rm69380_create_backlight(struct mipi_dsi_device *dsi)
+{
+ struct device *dev = &dsi->dev;
+ const struct backlight_properties props = {
+ .type = BACKLIGHT_RAW,
+ .brightness = 2047,
+ .max_brightness = 2047,
+ };
+
+ return devm_backlight_device_register(dev, dev_name(dev), dev, dsi,
+ &rm69380_bl_ops, &props);
+}
+
+static int rm69380_probe(struct mipi_dsi_device *dsi)
+{
+ struct mipi_dsi_host *dsi_sec_host;
+ struct rm69380_panel *ctx;
+ struct device *dev = &dsi->dev;
+ struct device_node *dsi_sec;
+ int ret, i;
+
+ ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
+ if (!ctx)
+ return -ENOMEM;
+
+ ctx->supplies[0].supply = "vddio";
+ ctx->supplies[1].supply = "avdd";
+ ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies),
+ ctx->supplies);
+ if (ret < 0)
+ return dev_err_probe(dev, ret, "Failed to get regulators\n");
+
+ ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
+ if (IS_ERR(ctx->reset_gpio))
+ return dev_err_probe(dev, PTR_ERR(ctx->reset_gpio),
+ "Failed to get reset-gpios\n");
+
+ dsi_sec = of_graph_get_remote_node(dsi->dev.of_node, 1, -1);
+
+ if (dsi_sec) {
+ const struct mipi_dsi_device_info info = { "RM69380", 0,
+ dsi_sec };
+
+ dev_dbg(dev, "Using Dual-DSI: found `%s`\n", dsi_sec->name);
+
+ dsi_sec_host = of_find_mipi_dsi_host_by_node(dsi_sec);
+ of_node_put(dsi_sec);
+ if (!dsi_sec_host)
+ return dev_err_probe(dev, -EPROBE_DEFER,
+ "Cannot get secondary DSI host\n");
+
+ ctx->dsi[1] =
+ devm_mipi_dsi_device_register_full(dev, dsi_sec_host, &info);
+ if (IS_ERR(ctx->dsi[1]))
+ return dev_err_probe(dev, PTR_ERR(ctx->dsi[1]),
+ "Cannot get secondary DSI node\n");
+
+ dev_dbg(dev, "Second DSI name `%s`\n", ctx->dsi[1]->name);
+ mipi_dsi_set_drvdata(ctx->dsi[1], ctx);
+ } else {
+ dev_dbg(dev, "Using Single-DSI\n");
+ }
+
+ ctx->dsi[0] = dsi;
+ mipi_dsi_set_drvdata(dsi, ctx);
+
+ drm_panel_init(&ctx->panel, dev, &rm69380_panel_funcs,
+ DRM_MODE_CONNECTOR_DSI);
+ ctx->panel.prepare_prev_first = true;
+
+ ctx->panel.backlight = rm69380_create_backlight(dsi);
+ if (IS_ERR(ctx->panel.backlight))
+ return dev_err_probe(dev, PTR_ERR(ctx->panel.backlight),
+ "Failed to create backlight\n");
+
+ drm_panel_add(&ctx->panel);
+
+ for (i = 0; i < ARRAY_SIZE(ctx->dsi); i++) {
+ if (!ctx->dsi[i])
+ continue;
+
+ dev_dbg(&ctx->dsi[i]->dev, "Binding DSI %d\n", i);
+
+ ctx->dsi[i]->lanes = 4;
+ ctx->dsi[i]->format = MIPI_DSI_FMT_RGB888;
+ ctx->dsi[i]->mode_flags = MIPI_DSI_MODE_VIDEO_BURST |
+ MIPI_DSI_CLOCK_NON_CONTINUOUS;
+
+ ret = mipi_dsi_attach(ctx->dsi[i]);
+ if (ret < 0) {
+ mipi_dsi_detach(ctx->dsi[i]);
+ drm_panel_remove(&ctx->panel);
+ return dev_err_probe(dev, ret,
+ "Failed to attach to DSI%d\n", i);
+ }
+ }
+
+ return 0;
+}
+
+static void rm69380_remove(struct mipi_dsi_device *dsi)
+{
+ struct rm69380_panel *ctx = mipi_dsi_get_drvdata(dsi);
+ int i;
+ int ret;
+
+ for (i = 0; i < ARRAY_SIZE(ctx->dsi); i++) {
+ if (!ctx->dsi[i])
+ continue;
+
+ ret = mipi_dsi_detach(ctx->dsi[i]);
+ if (ret < 0)
+ dev_err(&dsi->dev, "Failed to detach from DSI%d host: %d\n", i, ret);
+ }
+
+ drm_panel_remove(&ctx->panel);
+}
+
+static const struct of_device_id rm69380_of_match[] = {
+ { .compatible = "lenovo,j716f-edo-rm69380" },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, rm69380_of_match);
+
+static struct mipi_dsi_driver rm69380_panel_driver = {
+ .probe = rm69380_probe,
+ .remove = rm69380_remove,
+ .driver = {
+ .name = "panel-raydium-rm69380",
+ .of_match_table = rm69380_of_match,
+ },
+};
+module_mipi_dsi_driver(rm69380_panel_driver);
+
+MODULE_AUTHOR("David Wronek <david@mainlining.org");
+MODULE_DESCRIPTION("DRM driver for Raydium RM69380-equipped DSI panels");
+MODULE_LICENSE("GPL");
--
2.44.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/2] dt-bindings: display: panel: Add Raydium RM69380
2024-04-16 18:30 ` [PATCH v3 1/2] dt-bindings: display: panel: Add Raydium RM69380 David Wronek
@ 2024-04-16 19:20 ` Rob Herring
2024-04-17 14:40 ` Rob Herring
1 sibling, 0 replies; 9+ messages in thread
From: Rob Herring @ 2024-04-16 19:20 UTC (permalink / raw)
To: David Wronek
Cc: Thomas Zimmermann, Krzysztof Kozlowski, Maxime Ripard,
phone-devel, Jessica Zhang, Sam Ravnborg, devicetree,
~postmarketos/upstreaming, dri-devel, Daniel Vetter,
Marijn Suijten, Conor Dooley, Maarten Lankhorst, Konrad Dybcio,
linux-kernel, Neil Armstrong
On Tue, 16 Apr 2024 20:30:48 +0200, David Wronek wrote:
> Raydium RM69380 is a display driver IC used to drive OLED DSI panels.
> Add a dt-binding for it.
>
> Signed-off-by: David Wronek <david@mainlining.org>
> ---
> Note:
> Depends on commit 48a516363e29 ("dt-bindings: display: panel: add common dual-link schema")
> ---
> .../bindings/display/panel/raydium,rm69380.yaml | 91 ++++++++++++++++++++++
> 1 file changed, 91 insertions(+)
>
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml:
Error in referenced schema matching $id: http://devicetree.org/schemas/display/panel/panel-common-dual.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/display/panel/raydium,rm69380.example.dtb: panel@0: False schema does not allow {'compatible': ['lenovo,j716f-edo-rm69380', 'raydium,rm69380'], 'reg': [[0]], 'avdd-supply': [[4294967295]], 'vddio-supply': [[4294967295]], 'reset-gpios': [[4294967295, 75, 1]], 'ports': {'#address-cells': [[1]], '#size-cells': [[0]], 'port@0': {'reg': [[0]], 'endpoint': {'remote-endpoint': [[4294967295]]}}, 'port@1': {'reg': [[1]], 'endpoint': {'remote-endpoint': [[4294967295]]}}}, '$nodename': ['panel@0']}
from schema $id: http://devicetree.org/schemas/display/panel/raydium,rm69380.yaml#
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20240416-raydium-rm69380-driver-v3-1-21600ac4ce5f@mainlining.org
The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel
2024-04-16 18:30 ` [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel David Wronek
@ 2024-04-16 20:06 ` Dmitry Baryshkov
2024-04-16 20:27 ` Christophe JAILLET
2024-04-16 20:52 ` Marijn Suijten
2 siblings, 0 replies; 9+ messages in thread
From: Dmitry Baryshkov @ 2024-04-16 20:06 UTC (permalink / raw)
To: David Wronek
Cc: Neil Armstrong, Jessica Zhang, Sam Ravnborg, Daniel Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Marijn Suijten, Konrad Dybcio,
dri-devel, devicetree, linux-kernel, ~postmarketos/upstreaming,
phone-devel
On Tue, Apr 16, 2024 at 08:30:49PM +0200, David Wronek wrote:
> Add support for the 2560x1600@90Hz OLED panel by EDO bundled with a
> Raydium RM69380 controller, as found on the Lenovo Xiaoxin Pad Pro 2021.
>
> Signed-off-by: David Wronek <david@mainlining.org>
> ---
> drivers/gpu/drm/panel/Kconfig | 14 +
> drivers/gpu/drm/panel/Makefile | 1 +
> drivers/gpu/drm/panel/panel-raydium-rm69380.c | 367 ++++++++++++++++++++++++++
> 3 files changed, 382 insertions(+)
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel
2024-04-16 18:30 ` [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel David Wronek
2024-04-16 20:06 ` Dmitry Baryshkov
@ 2024-04-16 20:27 ` Christophe JAILLET
2024-04-16 20:52 ` Marijn Suijten
2 siblings, 0 replies; 9+ messages in thread
From: Christophe JAILLET @ 2024-04-16 20:27 UTC (permalink / raw)
To: david
Cc: conor+dt, daniel, devicetree, dri-devel, konradybcio, krzk+dt,
linux-kernel, maarten.lankhorst, marijn.suijten, mripard,
neil.armstrong, phone-devel, quic_jesszhan, robh, sam,
tzimmermann, ~postmarketos/upstreaming
Le 16/04/2024 à 20:30, David Wronek a écrit :
> Add support for the 2560x1600@90Hz OLED panel by EDO bundled with a
> Raydium RM69380 controller, as found on the Lenovo Xiaoxin Pad Pro 2021.
>
> Signed-off-by: David Wronek <david-vu3DzTD92ROXwddmVfQv5g@public.gmane.org>
> ---
> drivers/gpu/drm/panel/Kconfig | 14 +
> drivers/gpu/drm/panel/Makefile | 1 +
> drivers/gpu/drm/panel/panel-raydium-rm69380.c | 367 ++++++++++++++++++++++++++
> 3 files changed, 382 insertions(+)
>
...
> +static int rm69380_probe(struct mipi_dsi_device *dsi)
> +{
> + struct mipi_dsi_host *dsi_sec_host;
> + struct rm69380_panel *ctx;
> + struct device *dev = &dsi->dev;
> + struct device_node *dsi_sec;
> + int ret, i;
> +
> + ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
> + if (!ctx)
> + return -ENOMEM;
> +
> + ctx->supplies[0].supply = "vddio";
> + ctx->supplies[1].supply = "avdd";
> + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies),
> + ctx->supplies);
> + if (ret < 0)
> + return dev_err_probe(dev, ret, "Failed to get regulators\n");
> +
> + ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
> + if (IS_ERR(ctx->reset_gpio))
> + return dev_err_probe(dev, PTR_ERR(ctx->reset_gpio),
> + "Failed to get reset-gpios\n");
> +
> + dsi_sec = of_graph_get_remote_node(dsi->dev.of_node, 1, -1);
> +
> + if (dsi_sec) {
> + const struct mipi_dsi_device_info info = { "RM69380", 0,
> + dsi_sec };
> +
> + dev_dbg(dev, "Using Dual-DSI: found `%s`\n", dsi_sec->name);
> +
> + dsi_sec_host = of_find_mipi_dsi_host_by_node(dsi_sec);
> + of_node_put(dsi_sec);
> + if (!dsi_sec_host)
> + return dev_err_probe(dev, -EPROBE_DEFER,
> + "Cannot get secondary DSI host\n");
> +
> + ctx->dsi[1] =
> + devm_mipi_dsi_device_register_full(dev, dsi_sec_host, &info);
> + if (IS_ERR(ctx->dsi[1]))
> + return dev_err_probe(dev, PTR_ERR(ctx->dsi[1]),
> + "Cannot get secondary DSI node\n");
> +
> + dev_dbg(dev, "Second DSI name `%s`\n", ctx->dsi[1]->name);
> + mipi_dsi_set_drvdata(ctx->dsi[1], ctx);
> + } else {
> + dev_dbg(dev, "Using Single-DSI\n");
> + }
> +
> + ctx->dsi[0] = dsi;
> + mipi_dsi_set_drvdata(dsi, ctx);
> +
> + drm_panel_init(&ctx->panel, dev, &rm69380_panel_funcs,
> + DRM_MODE_CONNECTOR_DSI);
> + ctx->panel.prepare_prev_first = true;
> +
> + ctx->panel.backlight = rm69380_create_backlight(dsi);
> + if (IS_ERR(ctx->panel.backlight))
> + return dev_err_probe(dev, PTR_ERR(ctx->panel.backlight),
> + "Failed to create backlight\n");
> +
> + drm_panel_add(&ctx->panel);
> +
> + for (i = 0; i < ARRAY_SIZE(ctx->dsi); i++) {
> + if (!ctx->dsi[i])
> + continue;
> +
> + dev_dbg(&ctx->dsi[i]->dev, "Binding DSI %d\n", i);
> +
> + ctx->dsi[i]->lanes = 4;
> + ctx->dsi[i]->format = MIPI_DSI_FMT_RGB888;
> + ctx->dsi[i]->mode_flags = MIPI_DSI_MODE_VIDEO_BURST |
> + MIPI_DSI_CLOCK_NON_CONTINUOUS;
> +
> + ret = mipi_dsi_attach(ctx->dsi[i]);
> + if (ret < 0) {
> + mipi_dsi_detach(ctx->dsi[i]);
I don't think this works.
if 'i' fails, you have to detach 0...i-1
maybe something like below (complety untested).
> + drm_panel_remove(&ctx->panel);
> + return dev_err_probe(dev, ret,
> + "Failed to attach to DSI%d\n", i);
> + }
> + }
> +
> + return 0;
> +}
drm_panel_add(&ctx->panel);
for (i = 0; i < ARRAY_SIZE(ctx->dsi); i++) {
if (!ctx->dsi[i])
continue;
dev_dbg(&ctx->dsi[i]->dev, "Binding DSI %d\n", i);
ctx->dsi[i]->lanes = 4;
ctx->dsi[i]->format = MIPI_DSI_FMT_RGB888;
ctx->dsi[i]->mode_flags = MIPI_DSI_MODE_VIDEO_BURST |
MIPI_DSI_CLOCK_NON_CONTINUOUS;
ret = mipi_dsi_attach(ctx->dsi[i]);
if (ret < 0) {
dev_err_probe(dev, ret,
"Failed to attach to DSI%d\n", i);
goto err_detach_dsi;
}
}
return 0;
err_detach_dsi:
while (--i >= 0)
if (ctx->dsi[i])
mipi_dsi_detach(ctx->dsi[i]);
drm_panel_remove(&ctx->panel);
return ret;
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel
2024-04-16 18:30 ` [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel David Wronek
2024-04-16 20:06 ` Dmitry Baryshkov
2024-04-16 20:27 ` Christophe JAILLET
@ 2024-04-16 20:52 ` Marijn Suijten
2024-04-17 15:46 ` David Wronek
2 siblings, 1 reply; 9+ messages in thread
From: Marijn Suijten @ 2024-04-16 20:52 UTC (permalink / raw)
To: David Wronek
Cc: Neil Armstrong, Jessica Zhang, Sam Ravnborg, Daniel Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Konrad Dybcio, dri-devel,
devicetree, linux-kernel, ~postmarketos/upstreaming, phone-devel
On 2024-04-16 20:30:49, David Wronek wrote:
> Add support for the 2560x1600@90Hz OLED panel by EDO bundled with a
> Raydium RM69380 controller, as found on the Lenovo Xiaoxin Pad Pro 2021.
>
> Signed-off-by: David Wronek <david@mainlining.org>
> ---
> drivers/gpu/drm/panel/Kconfig | 14 +
> drivers/gpu/drm/panel/Makefile | 1 +
> drivers/gpu/drm/panel/panel-raydium-rm69380.c | 367 ++++++++++++++++++++++++++
> 3 files changed, 382 insertions(+)
>
> diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
> index 154f5bf82980..5b3eeb93b1a2 100644
> --- a/drivers/gpu/drm/panel/Kconfig
> +++ b/drivers/gpu/drm/panel/Kconfig
> @@ -542,6 +542,20 @@ config DRM_PANEL_RAYDIUM_RM692E5
> Say Y here if you want to enable support for Raydium RM692E5-based
> display panels, such as the one found in the Fairphone 5 smartphone.
>
> +config DRM_PANEL_RAYDIUM_RM69380
> + tristate "Raydium RM69380-based DSI panel"
> + depends on BACKLIGHT_CLASS_DEVICE
> + depends on DRM_DISPLAY_DP_HELPER
"DRM DisplayPort helpers"
But you said that this is a DSI device?
Looking in -next from yesterday, Raydium-RM692E5 and Visionox-R66451 get this
wrong as well.
> + depends on DRM_DISPLAY_HELPER
This also looks unused? The only helpers in the non-DP non-HDMI helper points
to more DP AUX code.
> + depends on DRM_MIPI_DSI
> + depends on OF
As I've shown in the SOFEF00 cleanup patch, devm_gpiod_get() is used which is
behind GPIOLIB. This should probably be a dependency.
> + help
> + Say Y here if you want to enable support for Raydium RM69380-based
> + display panels.
> +
> + This panel controller can be found in the Lenovo Xiaoxin Pad Pro 2021
> + in combination with an EDO OLED panel.
> +
> config DRM_PANEL_RONBO_RB070D30
> tristate "Ronbo Electronics RB070D30 panel"
> depends on OF
> diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
> index 24a02655d726..e2a2807d4ef0 100644
> --- a/drivers/gpu/drm/panel/Makefile
> +++ b/drivers/gpu/drm/panel/Makefile
> @@ -55,6 +55,7 @@ obj-$(CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN) += panel-raspberrypi-touchscreen
> obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM67191) += panel-raydium-rm67191.o
> obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM68200) += panel-raydium-rm68200.o
> obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM692E5) += panel-raydium-rm692e5.o
> +obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM69380) += panel-raydium-rm69380.o
> obj-$(CONFIG_DRM_PANEL_RONBO_RB070D30) += panel-ronbo-rb070d30.o
> obj-$(CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20) += panel-samsung-atna33xc20.o
> obj-$(CONFIG_DRM_PANEL_SAMSUNG_DB7430) += panel-samsung-db7430.o
> diff --git a/drivers/gpu/drm/panel/panel-raydium-rm69380.c b/drivers/gpu/drm/panel/panel-raydium-rm69380.c
> new file mode 100644
> index 000000000000..f89230c969b7
> --- /dev/null
> +++ b/drivers/gpu/drm/panel/panel-raydium-rm69380.c
> @@ -0,0 +1,367 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Generated with linux-mdss-dsi-panel-driver-generator from vendor device tree.
> + * Copyright (c) 2024 David Wronek <david@mainlining.org>
> + */
> +
> +#include <linux/backlight.h>
> +#include <linux/delay.h>
> +#include <linux/gpio/consumer.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> +#include <linux/of_graph.h>
> +#include <linux/regulator/consumer.h>
> +
> +#include <video/mipi_display.h>
> +
> +#include <drm/drm_mipi_dsi.h>
> +#include <drm/drm_modes.h>
> +#include <drm/drm_panel.h>
> +#include <drm/drm_probe_helper.h>
> +
> +struct rm69380_panel {
> + struct drm_panel panel;
> + struct mipi_dsi_device *dsi[2];
> + struct regulator_bulk_data supplies[2];
> + struct gpio_desc *reset_gpio;
> +};
> +
> +static inline
> +struct rm69380_panel *to_rm69380_panel(struct drm_panel *panel)
> +{
> + return container_of(panel, struct rm69380_panel, panel);
> +}
> +
> +static void rm69380_reset(struct rm69380_panel *ctx)
> +{
> + gpiod_set_value_cansleep(ctx->reset_gpio, 0);
> + usleep_range(15000, 16000);
> + gpiod_set_value_cansleep(ctx->reset_gpio, 1);
> + usleep_range(10000, 11000);
> + gpiod_set_value_cansleep(ctx->reset_gpio, 0);
> + msleep(30);
> +}
> +
> +static int rm69380_on(struct rm69380_panel *ctx)
> +{
> + struct mipi_dsi_device *dsi = ctx->dsi[0];
> + struct device *dev = &dsi->dev;
> + int ret;
> +
> + dsi->mode_flags |= MIPI_DSI_MODE_LPM;
> + if (ctx->dsi[1])
> + ctx->dsi[1]->mode_flags |= MIPI_DSI_MODE_LPM;
> +
> + mipi_dsi_dcs_write_seq(dsi, 0xfe, 0xd4);
> + mipi_dsi_dcs_write_seq(dsi, 0x00, 0x80);
Is this MIPI_DCS_NOP? Strange to see that with a parameter.
> + mipi_dsi_dcs_write_seq(dsi, 0xfe, 0xd0);
> + mipi_dsi_dcs_write_seq(dsi, 0x48, 0x00);
> + mipi_dsi_dcs_write_seq(dsi, 0xfe, 0x26);
> + mipi_dsi_dcs_write_seq(dsi, 0x75, 0x3f);
> + mipi_dsi_dcs_write_seq(dsi, 0x1d, 0x1a);
> + mipi_dsi_dcs_write_seq(dsi, 0xfe, 0x00);
> + mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, 0x28);
Separate from this patch, I feel like we should document these bits. Their
meaning might be defined by a paywall, intersecting a few downstream DTS with
DCS commands makes it instantly clear what each bit means.
> + mipi_dsi_dcs_write_seq(dsi, 0xc2, 0x08);
> +
> + ret = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
> + if (ret < 0) {
> + dev_err(dev, "Failed to set tear on: %d\n", ret);
> + return ret;
> + }
> +
> + ret = mipi_dsi_dcs_set_display_brightness(dsi, 0x7ff);
> + if (ret < 0) {
> + dev_err(dev, "Failed to set display brightness: %d\n", ret);
> + return ret;
> + }
> +
> + ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
> + if (ret < 0) {
> + dev_err(dev, "Failed to exit sleep mode: %d\n", ret);
> + return ret;
> + }
> + msleep(20);
> +
> + ret = mipi_dsi_dcs_set_display_on(dsi);
> + if (ret < 0) {
> + dev_err(dev, "Failed to set display on: %d\n", ret);
> + return ret;
> + }
> + msleep(36);
> +
> + return 0;
> +}
> +
> +static int rm69380_off(struct rm69380_panel *ctx)
> +{
> + struct mipi_dsi_device *dsi = ctx->dsi[0];
> + struct device *dev = &dsi->dev;
> + int ret;
> +
> + dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
> + if (ctx->dsi[1])
> + ctx->dsi[1]->mode_flags &= ~MIPI_DSI_MODE_LPM;
> +
> + ret = mipi_dsi_dcs_set_display_off(dsi);
> + if (ret < 0) {
> + dev_err(dev, "Failed to set display off: %d\n", ret);
> + return ret;
> + }
> + msleep(35);
> +
> + ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
> + if (ret < 0) {
> + dev_err(dev, "Failed to enter sleep mode: %d\n", ret);
> + return ret;
> + }
> + msleep(20);
> +
> + return 0;
> +}
> +
> +static int rm69380_prepare(struct drm_panel *panel)
> +{
> + struct rm69380_panel *ctx = to_rm69380_panel(panel);
> + struct device *dev = &ctx->dsi[0]->dev;
> + int ret;
> +
> + ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
> + if (ret < 0) {
> + dev_err(dev, "Failed to enable regulators: %d\n", ret);
> + return ret;
> + }
> +
> + rm69380_reset(ctx);
> +
> + ret = rm69380_on(ctx);
> + if (ret < 0) {
> + dev_err(dev, "Failed to initialize panel: %d\n", ret);
> + gpiod_set_value_cansleep(ctx->reset_gpio, 1);
> + regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static int rm69380_unprepare(struct drm_panel *panel)
> +{
> + struct rm69380_panel *ctx = to_rm69380_panel(panel);
> + struct device *dev = &ctx->dsi[0]->dev;
> + int ret;
> +
> + ret = rm69380_off(ctx);
> + if (ret < 0)
> + dev_err(dev, "Failed to un-initialize panel: %d\n", ret);
> +
> + gpiod_set_value_cansleep(ctx->reset_gpio, 1);
> + regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
> +
> + return 0;
> +}
> +
> +static const struct drm_display_mode rm69380_mode = {
> + .clock = (2560 + 32 + 12 + 38) * (1600 + 20 + 4 + 8) * 90 / 1000,
> + .hdisplay = 2560,
> + .hsync_start = 2560 + 32,
> + .hsync_end = 2560 + 32 + 12,
> + .htotal = 2560 + 32 + 12 + 38,
> + .vdisplay = 1600,
> + .vsync_start = 1600 + 20,
> + .vsync_end = 1600 + 20 + 4,
> + .vtotal = 1600 + 20 + 4 + 8,
> + .width_mm = 248,
> + .height_mm = 155,
> + .type = DRM_MODE_TYPE_DRIVER,
> +};
> +
> +static int rm69380_get_modes(struct drm_panel *panel,
> + struct drm_connector *connector)
> +{
> + return drm_connector_helper_get_modes_fixed(connector, &rm69380_mode);
> +}
> +
> +static const struct drm_panel_funcs rm69380_panel_funcs = {
> + .prepare = rm69380_prepare,
> + .unprepare = rm69380_unprepare,
> + .get_modes = rm69380_get_modes,
> +};
> +
> +static int rm69380_bl_update_status(struct backlight_device *bl)
> +{
> + struct mipi_dsi_device *dsi = bl_get_data(bl);
> + u16 brightness = backlight_get_brightness(bl);
> + int ret;
> +
> + dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
> +
> + ret = mipi_dsi_dcs_set_display_brightness_large(dsi, brightness);
> + if (ret < 0)
> + return ret;
> +
> + dsi->mode_flags |= MIPI_DSI_MODE_LPM;
> +
> + return 0;
> +}
> +
> +static int rm69380_bl_get_brightness(struct backlight_device *bl)
> +{
> + struct mipi_dsi_device *dsi = bl_get_data(bl);
> + u16 brightness;
> + int ret;
> +
> + dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
> +
> + ret = mipi_dsi_dcs_get_display_brightness_large(dsi, &brightness);
> + if (ret < 0)
> + return ret;
> +
> + dsi->mode_flags |= MIPI_DSI_MODE_LPM;
> +
> + return brightness;
> +}
> +
> +static const struct backlight_ops rm69380_bl_ops = {
> + .update_status = rm69380_bl_update_status,
> + .get_brightness = rm69380_bl_get_brightness,
> +};
> +
> +static struct backlight_device *
> +rm69380_create_backlight(struct mipi_dsi_device *dsi)
> +{
> + struct device *dev = &dsi->dev;
> + const struct backlight_properties props = {
> + .type = BACKLIGHT_RAW,
> + .brightness = 2047,
Might be nice to reduce the init brightness to something lower, like 1023 or
511? But also drop the brightness call in _on().
> + .max_brightness = 2047,
> + };
> +
> + return devm_backlight_device_register(dev, dev_name(dev), dev, dsi,
> + &rm69380_bl_ops, &props);
> +}
> +
> +static int rm69380_probe(struct mipi_dsi_device *dsi)
> +{
> + struct mipi_dsi_host *dsi_sec_host;
> + struct rm69380_panel *ctx;
> + struct device *dev = &dsi->dev;
> + struct device_node *dsi_sec;
> + int ret, i;
> +
> + ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
> + if (!ctx)
> + return -ENOMEM;
> +
> + ctx->supplies[0].supply = "vddio";
> + ctx->supplies[1].supply = "avdd";
> + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies),
> + ctx->supplies);
> + if (ret < 0)
> + return dev_err_probe(dev, ret, "Failed to get regulators\n");
> +
> + ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
> + if (IS_ERR(ctx->reset_gpio))
> + return dev_err_probe(dev, PTR_ERR(ctx->reset_gpio),
> + "Failed to get reset-gpios\n");
> +
> + dsi_sec = of_graph_get_remote_node(dsi->dev.of_node, 1, -1);
> +
> + if (dsi_sec) {
> + const struct mipi_dsi_device_info info = { "RM69380", 0,
> + dsi_sec };
> +
> + dev_dbg(dev, "Using Dual-DSI: found `%s`\n", dsi_sec->name);
> +
> + dsi_sec_host = of_find_mipi_dsi_host_by_node(dsi_sec);
> + of_node_put(dsi_sec);
> + if (!dsi_sec_host)
> + return dev_err_probe(dev, -EPROBE_DEFER,
> + "Cannot get secondary DSI host\n");
> +
> + ctx->dsi[1] =
> + devm_mipi_dsi_device_register_full(dev, dsi_sec_host, &info);
> + if (IS_ERR(ctx->dsi[1]))
> + return dev_err_probe(dev, PTR_ERR(ctx->dsi[1]),
> + "Cannot get secondary DSI node\n");
> +
> + dev_dbg(dev, "Second DSI name `%s`\n", ctx->dsi[1]->name);
Let's drop my debug logs :)
> + mipi_dsi_set_drvdata(ctx->dsi[1], ctx);
> + } else {
> + dev_dbg(dev, "Using Single-DSI\n");
> + }
> +
> + ctx->dsi[0] = dsi;
> + mipi_dsi_set_drvdata(dsi, ctx);
> +
> + drm_panel_init(&ctx->panel, dev, &rm69380_panel_funcs,
> + DRM_MODE_CONNECTOR_DSI);
> + ctx->panel.prepare_prev_first = true;
> +
> + ctx->panel.backlight = rm69380_create_backlight(dsi);
> + if (IS_ERR(ctx->panel.backlight))
> + return dev_err_probe(dev, PTR_ERR(ctx->panel.backlight),
> + "Failed to create backlight\n");
> +
> + drm_panel_add(&ctx->panel);
> +
> + for (i = 0; i < ARRAY_SIZE(ctx->dsi); i++) {
> + if (!ctx->dsi[i])
> + continue;
> +
> + dev_dbg(&ctx->dsi[i]->dev, "Binding DSI %d\n", i);
Probably not very useful?
> +
> + ctx->dsi[i]->lanes = 4;
> + ctx->dsi[i]->format = MIPI_DSI_FMT_RGB888;
> + ctx->dsi[i]->mode_flags = MIPI_DSI_MODE_VIDEO_BURST |
> + MIPI_DSI_CLOCK_NON_CONTINUOUS;
> +
> + ret = mipi_dsi_attach(ctx->dsi[i]);
> + if (ret < 0) {
> + mipi_dsi_detach(ctx->dsi[i]);
This isn't sound as written. If attaching fails, it is likely an error to
detach the same DSI device.
The error scenario that Christophe pointed out is when attaching dsi[1]
fails, in this case you have to detach dsi[0]. But as written in late v2
review, instead of making complicated logic statements there is a matching
devm_mipi_dsi_attach() to handle these cleanup scenarios for you. This should
also remove the need for mipi_dsi_attach() in the _remove function.
- Marijn
> + drm_panel_remove(&ctx->panel);
> + return dev_err_probe(dev, ret,
> + "Failed to attach to DSI%d\n", i);
> + }
> + }
> +
> + return 0;
> +}
> +
> +static void rm69380_remove(struct mipi_dsi_device *dsi)
> +{
> + struct rm69380_panel *ctx = mipi_dsi_get_drvdata(dsi);
> + int i;
> + int ret;
> +
> + for (i = 0; i < ARRAY_SIZE(ctx->dsi); i++) {
> + if (!ctx->dsi[i])
> + continue;
> +
> + ret = mipi_dsi_detach(ctx->dsi[i]);
> + if (ret < 0)
> + dev_err(&dsi->dev, "Failed to detach from DSI%d host: %d\n", i, ret);
> + }
> +
> + drm_panel_remove(&ctx->panel);
> +}
> +
> +static const struct of_device_id rm69380_of_match[] = {
> + { .compatible = "lenovo,j716f-edo-rm69380" },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, rm69380_of_match);
> +
> +static struct mipi_dsi_driver rm69380_panel_driver = {
> + .probe = rm69380_probe,
> + .remove = rm69380_remove,
> + .driver = {
> + .name = "panel-raydium-rm69380",
> + .of_match_table = rm69380_of_match,
> + },
> +};
> +module_mipi_dsi_driver(rm69380_panel_driver);
> +
> +MODULE_AUTHOR("David Wronek <david@mainlining.org");
> +MODULE_DESCRIPTION("DRM driver for Raydium RM69380-equipped DSI panels");
> +MODULE_LICENSE("GPL");
>
> --
> 2.44.0
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/2] dt-bindings: display: panel: Add Raydium RM69380
2024-04-16 18:30 ` [PATCH v3 1/2] dt-bindings: display: panel: Add Raydium RM69380 David Wronek
2024-04-16 19:20 ` Rob Herring
@ 2024-04-17 14:40 ` Rob Herring
1 sibling, 0 replies; 9+ messages in thread
From: Rob Herring @ 2024-04-17 14:40 UTC (permalink / raw)
To: David Wronek
Cc: Neil Armstrong, Jessica Zhang, Sam Ravnborg, Daniel Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
Krzysztof Kozlowski, Conor Dooley, Marijn Suijten, Konrad Dybcio,
dri-devel, devicetree, linux-kernel, ~postmarketos/upstreaming,
phone-devel
On Tue, Apr 16, 2024 at 08:30:48PM +0200, David Wronek wrote:
> Raydium RM69380 is a display driver IC used to drive OLED DSI panels.
> Add a dt-binding for it.
>
> Signed-off-by: David Wronek <david@mainlining.org>
> ---
> Note:
> Depends on commit 48a516363e29 ("dt-bindings: display: panel: add common dual-link schema")
> ---
> .../bindings/display/panel/raydium,rm69380.yaml | 91 ++++++++++++++++++++++
> 1 file changed, 91 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml b/Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml
> new file mode 100644
> index 000000000000..0ac7d033cbe0
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml
> @@ -0,0 +1,91 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/display/panel/raydium,rm69380.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Raydium RM6380-based DSI display panels
RM69380-based
> +
> +maintainers:
> + - David Wronek <david@mainlining.org>
> +
> +description:
> + The Raydium RM69380 is a generic DSI panel IC used to control
> + OLED panels.
> +
> +allOf:
> + - $ref: panel-common-dual.yaml#
> +
> +properties:
> + compatible:
> + items:
> + - enum:
> + - lenovo,j716f-edo-rm69380
> + - const: raydium,rm69380
> + description: This indicates the panel manufacturer of the panel
> + that is in turn using the RM69380 panel driver. The compatible
> + string determines how the RM69380 panel driver shall be configured
> + to work with the indicated panel. The raydium,rm69380 compatible shall
> + always be provided as a fallback.
> +
> + avdd-supply:
> + description: Analog voltage rail
> +
> + vddio-supply:
> + description: I/O voltage rail
> +
> + reset-gpios:
> + maxItems: 1
> + description: phandle of gpio for reset line - This should be active low
> +
> + ports: true
> + reg: true
Drop these and change 'addtionalProperties' to 'unevaluatedProperties'.
Other properties in panel-common.yaml should be allowed. width-mm and
height-mm for example.
> +
> +required:
> + - compatible
> + - reg
> + - avdd-supply
> + - vddio-supply
> + - reset-gpios
> + - ports
Already required in panel-common-dual.yaml.
Rob
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel
2024-04-16 20:52 ` Marijn Suijten
@ 2024-04-17 15:46 ` David Wronek
0 siblings, 0 replies; 9+ messages in thread
From: David Wronek @ 2024-04-17 15:46 UTC (permalink / raw)
To: Marijn Suijten
Cc: Neil Armstrong, Jessica Zhang, Sam Ravnborg, Daniel Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Konrad Dybcio, dri-devel,
devicetree, linux-kernel, ~postmarketos/upstreaming, phone-devel
W dniu 2024-04-16 22:52, Marijn Suijten napisał(a):
> On 2024-04-16 20:30:49, David Wronek wrote:
>> Add support for the 2560x1600@90Hz OLED panel by EDO bundled with a
>> Raydium RM69380 controller, as found on the Lenovo Xiaoxin Pad Pro
>> 2021.
>>
>> Signed-off-by: David Wronek <david@mainlining.org>
>> ---
>> drivers/gpu/drm/panel/Kconfig | 14 +
>> drivers/gpu/drm/panel/Makefile | 1 +
>> drivers/gpu/drm/panel/panel-raydium-rm69380.c | 367
>> ++++++++++++++++++++++++++
>> 3 files changed, 382 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/panel/Kconfig
>> b/drivers/gpu/drm/panel/Kconfig
>> index 154f5bf82980..5b3eeb93b1a2 100644
>> --- a/drivers/gpu/drm/panel/Kconfig
>> +++ b/drivers/gpu/drm/panel/Kconfig
>> @@ -542,6 +542,20 @@ config DRM_PANEL_RAYDIUM_RM692E5
>> Say Y here if you want to enable support for Raydium RM692E5-based
>> display panels, such as the one found in the Fairphone 5
>> smartphone.
>>
>> +config DRM_PANEL_RAYDIUM_RM69380
>> + tristate "Raydium RM69380-based DSI panel"
>> + depends on BACKLIGHT_CLASS_DEVICE
>> + depends on DRM_DISPLAY_DP_HELPER
>
> "DRM DisplayPort helpers"
>
> But you said that this is a DSI device?
>
> Looking in -next from yesterday, Raydium-RM692E5 and Visionox-R66451
> get this
> wrong as well.
>
>> + depends on DRM_DISPLAY_HELPER
>
> This also looks unused? The only helpers in the non-DP non-HDMI helper
> points
> to more DP AUX code.
>
>> + depends on DRM_MIPI_DSI
>> + depends on OF
>
> As I've shown in the SOFEF00 cleanup patch, devm_gpiod_get() is used
> which is
> behind GPIOLIB. This should probably be a dependency.
>
>> + help
>> + Say Y here if you want to enable support for Raydium RM69380-based
>> + display panels.
>> +
>> + This panel controller can be found in the Lenovo Xiaoxin Pad Pro
>> 2021
>> + in combination with an EDO OLED panel.
>> +
>> config DRM_PANEL_RONBO_RB070D30
>> tristate "Ronbo Electronics RB070D30 panel"
>> depends on OF
>> diff --git a/drivers/gpu/drm/panel/Makefile
>> b/drivers/gpu/drm/panel/Makefile
>> index 24a02655d726..e2a2807d4ef0 100644
>> --- a/drivers/gpu/drm/panel/Makefile
>> +++ b/drivers/gpu/drm/panel/Makefile
>> @@ -55,6 +55,7 @@ obj-$(CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN) +=
>> panel-raspberrypi-touchscreen
>> obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM67191) += panel-raydium-rm67191.o
>> obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM68200) += panel-raydium-rm68200.o
>> obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM692E5) += panel-raydium-rm692e5.o
>> +obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM69380) += panel-raydium-rm69380.o
>> obj-$(CONFIG_DRM_PANEL_RONBO_RB070D30) += panel-ronbo-rb070d30.o
>> obj-$(CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20) +=
>> panel-samsung-atna33xc20.o
>> obj-$(CONFIG_DRM_PANEL_SAMSUNG_DB7430) += panel-samsung-db7430.o
>> diff --git a/drivers/gpu/drm/panel/panel-raydium-rm69380.c
>> b/drivers/gpu/drm/panel/panel-raydium-rm69380.c
>> new file mode 100644
>> index 000000000000..f89230c969b7
>> --- /dev/null
>> +++ b/drivers/gpu/drm/panel/panel-raydium-rm69380.c
>> @@ -0,0 +1,367 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Generated with linux-mdss-dsi-panel-driver-generator from vendor
>> device tree.
>> + * Copyright (c) 2024 David Wronek <david@mainlining.org>
>> + */
>> +
>> +#include <linux/backlight.h>
>> +#include <linux/delay.h>
>> +#include <linux/gpio/consumer.h>
>> +#include <linux/module.h>
>> +#include <linux/of.h>
>> +#include <linux/of_device.h>
>> +#include <linux/of_graph.h>
>> +#include <linux/regulator/consumer.h>
>> +
>> +#include <video/mipi_display.h>
>> +
>> +#include <drm/drm_mipi_dsi.h>
>> +#include <drm/drm_modes.h>
>> +#include <drm/drm_panel.h>
>> +#include <drm/drm_probe_helper.h>
>> +
>> +struct rm69380_panel {
>> + struct drm_panel panel;
>> + struct mipi_dsi_device *dsi[2];
>> + struct regulator_bulk_data supplies[2];
>> + struct gpio_desc *reset_gpio;
>> +};
>> +
>> +static inline
>> +struct rm69380_panel *to_rm69380_panel(struct drm_panel *panel)
>> +{
>> + return container_of(panel, struct rm69380_panel, panel);
>> +}
>> +
>> +static void rm69380_reset(struct rm69380_panel *ctx)
>> +{
>> + gpiod_set_value_cansleep(ctx->reset_gpio, 0);
>> + usleep_range(15000, 16000);
>> + gpiod_set_value_cansleep(ctx->reset_gpio, 1);
>> + usleep_range(10000, 11000);
>> + gpiod_set_value_cansleep(ctx->reset_gpio, 0);
>> + msleep(30);
>> +}
>> +
>> +static int rm69380_on(struct rm69380_panel *ctx)
>> +{
>> + struct mipi_dsi_device *dsi = ctx->dsi[0];
>> + struct device *dev = &dsi->dev;
>> + int ret;
>> +
>> + dsi->mode_flags |= MIPI_DSI_MODE_LPM;
>> + if (ctx->dsi[1])
>> + ctx->dsi[1]->mode_flags |= MIPI_DSI_MODE_LPM;
>> +
>> + mipi_dsi_dcs_write_seq(dsi, 0xfe, 0xd4);
>> + mipi_dsi_dcs_write_seq(dsi, 0x00, 0x80);
>
> Is this MIPI_DCS_NOP? Strange to see that with a parameter.
>
I don't think it is. 0xfe is the command to switch the 'manufacture
command set'. As you can see, it switches to a different MCS right after
this one. Given that I don't have a datasheet for this perticular driver
IC, I can't be absolutely certain, but considering that the drivers for
rm67191 and rm68200 are defining 0xfe as the command to switch the
commands sets, it's probably the same here.
>> + mipi_dsi_dcs_write_seq(dsi, 0xfe, 0xd0);
>> + mipi_dsi_dcs_write_seq(dsi, 0x48, 0x00);
>> + mipi_dsi_dcs_write_seq(dsi, 0xfe, 0x26);
>> + mipi_dsi_dcs_write_seq(dsi, 0x75, 0x3f);
>> + mipi_dsi_dcs_write_seq(dsi, 0x1d, 0x1a);
>> + mipi_dsi_dcs_write_seq(dsi, 0xfe, 0x00);
>> + mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, 0x28);
>
> Separate from this patch, I feel like we should document these bits.
> Their
> meaning might be defined by a paywall, intersecting a few downstream
> DTS with
> DCS commands makes it instantly clear what each bit means.
>
>> + mipi_dsi_dcs_write_seq(dsi, 0xc2, 0x08);
>> +
>> + ret = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
>> + if (ret < 0) {
>> + dev_err(dev, "Failed to set tear on: %d\n", ret);
>> + return ret;
>> + }
>> +
>> + ret = mipi_dsi_dcs_set_display_brightness(dsi, 0x7ff);
>> + if (ret < 0) {
>> + dev_err(dev, "Failed to set display brightness: %d\n", ret);
>> + return ret;
>> + }
>> +
>> + ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
>> + if (ret < 0) {
>> + dev_err(dev, "Failed to exit sleep mode: %d\n", ret);
>> + return ret;
>> + }
>> + msleep(20);
>> +
>> + ret = mipi_dsi_dcs_set_display_on(dsi);
>> + if (ret < 0) {
>> + dev_err(dev, "Failed to set display on: %d\n", ret);
>> + return ret;
>> + }
>> + msleep(36);
>> +
>> + return 0;
>> +}
>> +
>> +static int rm69380_off(struct rm69380_panel *ctx)
>> +{
>> + struct mipi_dsi_device *dsi = ctx->dsi[0];
>> + struct device *dev = &dsi->dev;
>> + int ret;
>> +
>> + dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
>> + if (ctx->dsi[1])
>> + ctx->dsi[1]->mode_flags &= ~MIPI_DSI_MODE_LPM;
>> +
>> + ret = mipi_dsi_dcs_set_display_off(dsi);
>> + if (ret < 0) {
>> + dev_err(dev, "Failed to set display off: %d\n", ret);
>> + return ret;
>> + }
>> + msleep(35);
>> +
>> + ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
>> + if (ret < 0) {
>> + dev_err(dev, "Failed to enter sleep mode: %d\n", ret);
>> + return ret;
>> + }
>> + msleep(20);
>> +
>> + return 0;
>> +}
>> +
>> +static int rm69380_prepare(struct drm_panel *panel)
>> +{
>> + struct rm69380_panel *ctx = to_rm69380_panel(panel);
>> + struct device *dev = &ctx->dsi[0]->dev;
>> + int ret;
>> +
>> + ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies),
>> ctx->supplies);
>> + if (ret < 0) {
>> + dev_err(dev, "Failed to enable regulators: %d\n", ret);
>> + return ret;
>> + }
>> +
>> + rm69380_reset(ctx);
>> +
>> + ret = rm69380_on(ctx);
>> + if (ret < 0) {
>> + dev_err(dev, "Failed to initialize panel: %d\n", ret);
>> + gpiod_set_value_cansleep(ctx->reset_gpio, 1);
>> + regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
>> + return ret;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int rm69380_unprepare(struct drm_panel *panel)
>> +{
>> + struct rm69380_panel *ctx = to_rm69380_panel(panel);
>> + struct device *dev = &ctx->dsi[0]->dev;
>> + int ret;
>> +
>> + ret = rm69380_off(ctx);
>> + if (ret < 0)
>> + dev_err(dev, "Failed to un-initialize panel: %d\n", ret);
>> +
>> + gpiod_set_value_cansleep(ctx->reset_gpio, 1);
>> + regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
>> +
>> + return 0;
>> +}
>> +
>> +static const struct drm_display_mode rm69380_mode = {
>> + .clock = (2560 + 32 + 12 + 38) * (1600 + 20 + 4 + 8) * 90 / 1000,
>> + .hdisplay = 2560,
>> + .hsync_start = 2560 + 32,
>> + .hsync_end = 2560 + 32 + 12,
>> + .htotal = 2560 + 32 + 12 + 38,
>> + .vdisplay = 1600,
>> + .vsync_start = 1600 + 20,
>> + .vsync_end = 1600 + 20 + 4,
>> + .vtotal = 1600 + 20 + 4 + 8,
>> + .width_mm = 248,
>> + .height_mm = 155,
>> + .type = DRM_MODE_TYPE_DRIVER,
>> +};
>> +
>> +static int rm69380_get_modes(struct drm_panel *panel,
>> + struct drm_connector *connector)
>> +{
>> + return drm_connector_helper_get_modes_fixed(connector,
>> &rm69380_mode);
>> +}
>> +
>> +static const struct drm_panel_funcs rm69380_panel_funcs = {
>> + .prepare = rm69380_prepare,
>> + .unprepare = rm69380_unprepare,
>> + .get_modes = rm69380_get_modes,
>> +};
>> +
>> +static int rm69380_bl_update_status(struct backlight_device *bl)
>> +{
>> + struct mipi_dsi_device *dsi = bl_get_data(bl);
>> + u16 brightness = backlight_get_brightness(bl);
>> + int ret;
>> +
>> + dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
>> +
>> + ret = mipi_dsi_dcs_set_display_brightness_large(dsi, brightness);
>> + if (ret < 0)
>> + return ret;
>> +
>> + dsi->mode_flags |= MIPI_DSI_MODE_LPM;
>> +
>> + return 0;
>> +}
>> +
>> +static int rm69380_bl_get_brightness(struct backlight_device *bl)
>> +{
>> + struct mipi_dsi_device *dsi = bl_get_data(bl);
>> + u16 brightness;
>> + int ret;
>> +
>> + dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
>> +
>> + ret = mipi_dsi_dcs_get_display_brightness_large(dsi, &brightness);
>> + if (ret < 0)
>> + return ret;
>> +
>> + dsi->mode_flags |= MIPI_DSI_MODE_LPM;
>> +
>> + return brightness;
>> +}
>> +
>> +static const struct backlight_ops rm69380_bl_ops = {
>> + .update_status = rm69380_bl_update_status,
>> + .get_brightness = rm69380_bl_get_brightness,
>> +};
>> +
>> +static struct backlight_device *
>> +rm69380_create_backlight(struct mipi_dsi_device *dsi)
>> +{
>> + struct device *dev = &dsi->dev;
>> + const struct backlight_properties props = {
>> + .type = BACKLIGHT_RAW,
>> + .brightness = 2047,
>
> Might be nice to reduce the init brightness to something lower, like
> 1023 or
> 511? But also drop the brightness call in _on().
>
Good call, the OLED panel on my tablet likes to burn-in (temporarily)
really fast on high brightness. I did however notice that at least on an
Arch Linux ARM rootfs, the brightness is being remembered and restored
upon boot.
>> + .max_brightness = 2047,
>> + };
>> +
>> + return devm_backlight_device_register(dev, dev_name(dev), dev, dsi,
>> + &rm69380_bl_ops, &props);
>> +}
>> +
>> +static int rm69380_probe(struct mipi_dsi_device *dsi)
>> +{
>> + struct mipi_dsi_host *dsi_sec_host;
>> + struct rm69380_panel *ctx;
>> + struct device *dev = &dsi->dev;
>> + struct device_node *dsi_sec;
>> + int ret, i;
>> +
>> + ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
>> + if (!ctx)
>> + return -ENOMEM;
>> +
>> + ctx->supplies[0].supply = "vddio";
>> + ctx->supplies[1].supply = "avdd";
>> + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies),
>> + ctx->supplies);
>> + if (ret < 0)
>> + return dev_err_probe(dev, ret, "Failed to get regulators\n");
>> +
>> + ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
>> + if (IS_ERR(ctx->reset_gpio))
>> + return dev_err_probe(dev, PTR_ERR(ctx->reset_gpio),
>> + "Failed to get reset-gpios\n");
>> +
>> + dsi_sec = of_graph_get_remote_node(dsi->dev.of_node, 1, -1);
>> +
>> + if (dsi_sec) {
>> + const struct mipi_dsi_device_info info = { "RM69380", 0,
>> + dsi_sec };
>> +
>> + dev_dbg(dev, "Using Dual-DSI: found `%s`\n", dsi_sec->name);
>> +
>> + dsi_sec_host = of_find_mipi_dsi_host_by_node(dsi_sec);
>> + of_node_put(dsi_sec);
>> + if (!dsi_sec_host)
>> + return dev_err_probe(dev, -EPROBE_DEFER,
>> + "Cannot get secondary DSI host\n");
>> +
>> + ctx->dsi[1] =
>> + devm_mipi_dsi_device_register_full(dev, dsi_sec_host, &info);
>> + if (IS_ERR(ctx->dsi[1]))
>> + return dev_err_probe(dev, PTR_ERR(ctx->dsi[1]),
>> + "Cannot get secondary DSI node\n");
>> +
>> + dev_dbg(dev, "Second DSI name `%s`\n", ctx->dsi[1]->name);
>
> Let's drop my debug logs :)
>
>> + mipi_dsi_set_drvdata(ctx->dsi[1], ctx);
>> + } else {
>> + dev_dbg(dev, "Using Single-DSI\n");
>> + }
>> +
>> + ctx->dsi[0] = dsi;
>> + mipi_dsi_set_drvdata(dsi, ctx);
>> +
>> + drm_panel_init(&ctx->panel, dev, &rm69380_panel_funcs,
>> + DRM_MODE_CONNECTOR_DSI);
>> + ctx->panel.prepare_prev_first = true;
>> +
>> + ctx->panel.backlight = rm69380_create_backlight(dsi);
>> + if (IS_ERR(ctx->panel.backlight))
>> + return dev_err_probe(dev, PTR_ERR(ctx->panel.backlight),
>> + "Failed to create backlight\n");
>> +
>> + drm_panel_add(&ctx->panel);
>> +
>> + for (i = 0; i < ARRAY_SIZE(ctx->dsi); i++) {
>> + if (!ctx->dsi[i])
>> + continue;
>> +
>> + dev_dbg(&ctx->dsi[i]->dev, "Binding DSI %d\n", i);
>
> Probably not very useful?
>
>> +
>> + ctx->dsi[i]->lanes = 4;
>> + ctx->dsi[i]->format = MIPI_DSI_FMT_RGB888;
>> + ctx->dsi[i]->mode_flags = MIPI_DSI_MODE_VIDEO_BURST |
>> + MIPI_DSI_CLOCK_NON_CONTINUOUS;
>> +
>> + ret = mipi_dsi_attach(ctx->dsi[i]);
>> + if (ret < 0) {
>> + mipi_dsi_detach(ctx->dsi[i]);
>
> This isn't sound as written. If attaching fails, it is likely an error
> to
> detach the same DSI device.
>
> The error scenario that Christophe pointed out is when attaching dsi[1]
> fails, in this case you have to detach dsi[0]. But as written in late
> v2
> review, instead of making complicated logic statements there is a
> matching
> devm_mipi_dsi_attach() to handle these cleanup scenarios for you. This
> should
> also remove the need for mipi_dsi_attach() in the _remove function.
>
> - Marijn
>
>> + drm_panel_remove(&ctx->panel);
>> + return dev_err_probe(dev, ret,
>> + "Failed to attach to DSI%d\n", i);
>> + }
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static void rm69380_remove(struct mipi_dsi_device *dsi)
>> +{
>> + struct rm69380_panel *ctx = mipi_dsi_get_drvdata(dsi);
>> + int i;
>> + int ret;
>> +
>> + for (i = 0; i < ARRAY_SIZE(ctx->dsi); i++) {
>> + if (!ctx->dsi[i])
>> + continue;
>> +
>> + ret = mipi_dsi_detach(ctx->dsi[i]);
>> + if (ret < 0)
>> + dev_err(&dsi->dev, "Failed to detach from DSI%d host: %d\n", i,
>> ret);
>> + }
>> +
>> + drm_panel_remove(&ctx->panel);
>> +}
>> +
>> +static const struct of_device_id rm69380_of_match[] = {
>> + { .compatible = "lenovo,j716f-edo-rm69380" },
>> + { /* sentinel */ }
>> +};
>> +MODULE_DEVICE_TABLE(of, rm69380_of_match);
>> +
>> +static struct mipi_dsi_driver rm69380_panel_driver = {
>> + .probe = rm69380_probe,
>> + .remove = rm69380_remove,
>> + .driver = {
>> + .name = "panel-raydium-rm69380",
>> + .of_match_table = rm69380_of_match,
>> + },
>> +};
>> +module_mipi_dsi_driver(rm69380_panel_driver);
>> +
>> +MODULE_AUTHOR("David Wronek <david@mainlining.org");
>> +MODULE_DESCRIPTION("DRM driver for Raydium RM69380-equipped DSI
>> panels");
>> +MODULE_LICENSE("GPL");
>>
>> --
>> 2.44.0
>>
--
Best regards,
David Wronek <david@mainlining.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-04-17 15:46 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-16 18:30 [PATCH v3 0/2] Add driver for Raydium RM69380-based DSI panels David Wronek
2024-04-16 18:30 ` [PATCH v3 1/2] dt-bindings: display: panel: Add Raydium RM69380 David Wronek
2024-04-16 19:20 ` Rob Herring
2024-04-17 14:40 ` Rob Herring
2024-04-16 18:30 ` [PATCH v3 2/2] drm/panel: Add driver for EDO RM69380 OLED panel David Wronek
2024-04-16 20:06 ` Dmitry Baryshkov
2024-04-16 20:27 ` Christophe JAILLET
2024-04-16 20:52 ` Marijn Suijten
2024-04-17 15:46 ` David Wronek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.