All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 1/2] dt-bindings: display: bridge: Add TI DLPC3433 DSI to DMD
@ 2022-06-03 14:03 ` Jagan Teki
  0 siblings, 0 replies; 8+ messages in thread
From: Jagan Teki @ 2022-06-03 14:03 UTC (permalink / raw)
  To: Rob Herring, Andrzej Hajda, Neil Armstrong, Robert Foss,
	Laurent Pinchart
  Cc: Sam Ravnborg, dri-devel, devicetree, linux-amarula, Jagan Teki,
	Christopher Vollo, Rob Herring

TI DLPC3433 is a MIPI DSI based display controller bridge
for processing high resolution DMD based projectors.

It has a flexible configuration of MIPI DSI and DPI signal
input that produces a DMD output in RGB565, RGB666, RGB888
formats.

It supports upto 720p resolution with 60 and 120 Hz refresh
rates.

Add dt-bingings for it.

Signed-off-by: Christopher Vollo <chris@renewoutreach.org>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
Changes for v3:
- collect Rob r-b
Changes for v2:
- fix compatible
- drop reg description
- fix enable_gpio description
- fix port@2

 .../bindings/display/bridge/ti,dlpc3433.yaml  | 117 ++++++++++++++++++
 MAINTAINERS                                   |   5 +
 2 files changed, 122 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml

diff --git a/Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml b/Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
new file mode 100644
index 000000000000..542193d77cdf
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
@@ -0,0 +1,117 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/bridge/ti,dlpc3433.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: TI DLPC3433 MIPI DSI to DMD bridge
+
+maintainers:
+  - Jagan Teki <jagan@amarulasolutions.com>
+  - Christopher Vollo <chris@renewoutreach.org>
+
+description: |
+  TI DLPC3433 is a MIPI DSI based display controller bridge
+  for processing high resolution DMD based projectors.
+
+  It has a flexible configuration of MIPI DSI and DPI signal
+  input that produces a DMD output in RGB565, RGB666, RGB888
+  formats.
+
+  It supports upto 720p resolution with 60 and 120 Hz refresh
+  rates.
+
+properties:
+  compatible:
+    const: ti,dlpc3433
+
+  reg:
+    enum:
+      - 0x1b
+      - 0x1d
+
+  enable-gpios:
+    description: PROJ_ON pin, chip powers up PROJ_ON is high.
+
+  vcc_intf-supply:
+    description: A 1.8V/3.3V supply that power the Host I/O.
+
+  vcc_flsh-supply:
+    description: A 1.8V/3.3V supply that power the Flash I/O.
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+
+    properties:
+      port@0:
+        $ref: /schemas/graph.yaml#/$defs/port-base
+        unevaluatedProperties: false
+        description: Video port for MIPI DSI input.
+
+        properties:
+          endpoint:
+            $ref: /schemas/media/video-interfaces.yaml#
+            unevaluatedProperties: false
+
+            properties:
+              data-lanes:
+                description: array of physical DSI data lane indexes.
+                minItems: 1
+                items:
+                  - const: 1
+                  - const: 2
+                  - const: 3
+                  - const: 4
+
+      port@1:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: Video port for DMD output.
+
+    required:
+      - port@0
+      - port@1
+
+required:
+  - compatible
+  - reg
+  - enable-gpios
+  - ports
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+
+    i2c1 {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        bridge@1b {
+            compatible = "ti,dlpc3433";
+            reg = <0x1b>;
+            enable-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+
+            ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                    reg = <0>;
+
+                    bridge_in_dsi: endpoint {
+                        remote-endpoint = <&dsi_out_bridge>;
+                        data-lanes = <1 2 3 4>;
+                    };
+                };
+
+                port@1 {
+                    reg = <1>;
+
+                    bridge_out_panel: endpoint {
+                        remote-endpoint = <&panel_out_bridge>;
+                    };
+                };
+            };
+        };
+    };
diff --git a/MAINTAINERS b/MAINTAINERS
index 11da16bfa123..aea0fe5156af 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6431,6 +6431,11 @@ DRM DRIVER FOR TDFX VIDEO CARDS
 S:	Orphan / Obsolete
 F:	drivers/gpu/drm/tdfx/
 
+DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
+M:	Jagan Teki <jagan@amarulasolutions.com>
+S:	Maintained
+F:	Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
+
 DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
 R:	Douglas Anderson <dianders@chromium.org>
 F:	Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 1/2] dt-bindings: display: bridge: Add TI DLPC3433 DSI to DMD
@ 2022-06-03 14:03 ` Jagan Teki
  0 siblings, 0 replies; 8+ messages in thread
From: Jagan Teki @ 2022-06-03 14:03 UTC (permalink / raw)
  To: Rob Herring, Andrzej Hajda, Neil Armstrong, Robert Foss,
	Laurent Pinchart
  Cc: devicetree, Christopher Vollo, linux-amarula, dri-devel,
	Jagan Teki, Sam Ravnborg

TI DLPC3433 is a MIPI DSI based display controller bridge
for processing high resolution DMD based projectors.

It has a flexible configuration of MIPI DSI and DPI signal
input that produces a DMD output in RGB565, RGB666, RGB888
formats.

It supports upto 720p resolution with 60 and 120 Hz refresh
rates.

Add dt-bingings for it.

Signed-off-by: Christopher Vollo <chris@renewoutreach.org>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
Changes for v3:
- collect Rob r-b
Changes for v2:
- fix compatible
- drop reg description
- fix enable_gpio description
- fix port@2

 .../bindings/display/bridge/ti,dlpc3433.yaml  | 117 ++++++++++++++++++
 MAINTAINERS                                   |   5 +
 2 files changed, 122 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml

diff --git a/Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml b/Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
new file mode 100644
index 000000000000..542193d77cdf
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
@@ -0,0 +1,117 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/bridge/ti,dlpc3433.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: TI DLPC3433 MIPI DSI to DMD bridge
+
+maintainers:
+  - Jagan Teki <jagan@amarulasolutions.com>
+  - Christopher Vollo <chris@renewoutreach.org>
+
+description: |
+  TI DLPC3433 is a MIPI DSI based display controller bridge
+  for processing high resolution DMD based projectors.
+
+  It has a flexible configuration of MIPI DSI and DPI signal
+  input that produces a DMD output in RGB565, RGB666, RGB888
+  formats.
+
+  It supports upto 720p resolution with 60 and 120 Hz refresh
+  rates.
+
+properties:
+  compatible:
+    const: ti,dlpc3433
+
+  reg:
+    enum:
+      - 0x1b
+      - 0x1d
+
+  enable-gpios:
+    description: PROJ_ON pin, chip powers up PROJ_ON is high.
+
+  vcc_intf-supply:
+    description: A 1.8V/3.3V supply that power the Host I/O.
+
+  vcc_flsh-supply:
+    description: A 1.8V/3.3V supply that power the Flash I/O.
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+
+    properties:
+      port@0:
+        $ref: /schemas/graph.yaml#/$defs/port-base
+        unevaluatedProperties: false
+        description: Video port for MIPI DSI input.
+
+        properties:
+          endpoint:
+            $ref: /schemas/media/video-interfaces.yaml#
+            unevaluatedProperties: false
+
+            properties:
+              data-lanes:
+                description: array of physical DSI data lane indexes.
+                minItems: 1
+                items:
+                  - const: 1
+                  - const: 2
+                  - const: 3
+                  - const: 4
+
+      port@1:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: Video port for DMD output.
+
+    required:
+      - port@0
+      - port@1
+
+required:
+  - compatible
+  - reg
+  - enable-gpios
+  - ports
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+
+    i2c1 {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        bridge@1b {
+            compatible = "ti,dlpc3433";
+            reg = <0x1b>;
+            enable-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+
+            ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                    reg = <0>;
+
+                    bridge_in_dsi: endpoint {
+                        remote-endpoint = <&dsi_out_bridge>;
+                        data-lanes = <1 2 3 4>;
+                    };
+                };
+
+                port@1 {
+                    reg = <1>;
+
+                    bridge_out_panel: endpoint {
+                        remote-endpoint = <&panel_out_bridge>;
+                    };
+                };
+            };
+        };
+    };
diff --git a/MAINTAINERS b/MAINTAINERS
index 11da16bfa123..aea0fe5156af 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6431,6 +6431,11 @@ DRM DRIVER FOR TDFX VIDEO CARDS
 S:	Orphan / Obsolete
 F:	drivers/gpu/drm/tdfx/
 
+DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
+M:	Jagan Teki <jagan@amarulasolutions.com>
+S:	Maintained
+F:	Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
+
 DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
 R:	Douglas Anderson <dianders@chromium.org>
 F:	Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 2/2] drm: bridge: Add TI DLPC3433 DSI to DMD bridge
  2022-06-03 14:03 ` Jagan Teki
@ 2022-06-03 14:03   ` Jagan Teki
  -1 siblings, 0 replies; 8+ messages in thread
From: Jagan Teki @ 2022-06-03 14:03 UTC (permalink / raw)
  To: Rob Herring, Andrzej Hajda, Neil Armstrong, Robert Foss,
	Laurent Pinchart
  Cc: Sam Ravnborg, dri-devel, devicetree, linux-amarula, Jagan Teki,
	Christopher Vollo

TI DLPC3433 is a MIPI DSI based display controller bridge
for processing high resolution DMD based projectors.

It has a flexible configuration of MIPI DSI and DPI signal
input that produces a DMD output in RGB565, RGB666, RGB888
formats.

It supports upto 720p resolution with 60 and 120 Hz refresh
rates.

Add bridge driver for it.

Signed-off-by: Christopher Vollo <chris@renewoutreach.org>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v3:
- none
Changes for v2:
- fixed license
- filled display size buffer
- fixed power off
- fixed dev_err_probe

 MAINTAINERS                          |   1 +
 drivers/gpu/drm/bridge/Kconfig       |  16 +
 drivers/gpu/drm/bridge/Makefile      |   1 +
 drivers/gpu/drm/bridge/ti-dlpc3433.c | 417 +++++++++++++++++++++++++++
 4 files changed, 435 insertions(+)
 create mode 100644 drivers/gpu/drm/bridge/ti-dlpc3433.c

diff --git a/MAINTAINERS b/MAINTAINERS
index aea0fe5156af..ede21cc48708 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6435,6 +6435,7 @@ DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
 M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
+F:	drivers/gpu/drm/bridge/ti-dlpc3433.c
 
 DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
 R:	Douglas Anderson <dianders@chromium.org>
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 146ab069838f..4b28f939fff6 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -321,6 +321,22 @@ config DRM_TOSHIBA_TC358775
 	help
 	  Toshiba TC358775 DSI/LVDS bridge chip driver.
 
+config DRM_TI_DLPC3433
+	tristate "TI DLPC3433 Display controller"
+	depends on DRM && DRM_PANEL
+	depends on OF
+	select DRM_MIPI_DSI
+	help
+	  TI DLPC3433 is a MIPI DSI based display controller bridge
+	  for processing high resolution DMD based projectors.
+
+	  It has a flexible configuration of MIPI DSI and DPI signal
+	  input that produces a DMD output in RGB565, RGB666, RGB888
+	  formats.
+
+	  It supports upto 720p resolution with 60 and 120 Hz refresh
+	  rates.
+
 config DRM_TI_TFP410
 	tristate "TI TFP410 DVI/HDMI bridge"
 	depends on OF
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index f6c0a95de549..043b499545e3 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_DRM_TOSHIBA_TC358767) += tc358767.o
 obj-$(CONFIG_DRM_TOSHIBA_TC358768) += tc358768.o
 obj-$(CONFIG_DRM_TOSHIBA_TC358775) += tc358775.o
 obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
+obj-$(CONFIG_DRM_TI_DLPC3433) += ti-dlpc3433.o
 obj-$(CONFIG_DRM_TI_SN65DSI83) += ti-sn65dsi83.o
 obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o
 obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/ti-dlpc3433.c
new file mode 100644
index 000000000000..06e519798ac5
--- /dev/null
+++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c
@@ -0,0 +1,417 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2021 RenewOutReach
+ * Copyright (C) 2021 Amarula Solutions(India)
+ *
+ * Author:
+ * Jagan Teki <jagan@amarulasolutions.com>
+ * Christopher Vollo <chris@renewoutreach.org>
+ */
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_print.h>
+#include <drm/drm_mipi_dsi.h>
+
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
+enum cmd_registers {
+	WR_INPUT_SOURCE		= 0x05,	/* Write Input Source Select */
+	WR_EXT_SOURCE_FMT	= 0x07, /* Write External Video Source Format */
+	WR_IMAGE_CROP		= 0x10,	/* Write Image Crop */
+	WR_DISPLAY_SIZE		= 0x12,	/* Write Display Size */
+	WR_IMAGE_FREEZE		= 0x1A,	/* Write Image Freeze */
+	WR_INPUT_IMAGE_SIZE	= 0x2E,	/* Write External Input Image Size */
+	WR_RGB_LED_EN		= 0x52,	/* Write RGB LED Enable */
+	WR_RGB_LED_CURRENT	= 0x54,	/* Write RGB LED Current */
+	WR_RGB_LED_MAX_CURRENT	= 0x5C,	/* Write RGB LED Max Current */
+	WR_DSI_HS_CLK		= 0xBD,	/* Write DSI HS Clock */
+	RD_DEVICE_ID		= 0xD4,	/* Read Controller Device ID */
+	WR_DSI_PORT_EN		= 0xD7,	/* Write DSI Port Enable */
+};
+
+enum input_source {
+	INPUT_EXTERNAL_VIDEO	= 0,
+	INPUT_TEST_PATTERN,
+	INPUT_SPLASH_SCREEN,
+};
+
+#define DEV_ID_MASK		GENMASK(3, 0)
+#define IMAGE_FREESE_EN		BIT(0)
+#define DSI_PORT_EN		0
+#define EXT_SOURCE_FMT_DSI	0
+#define RED_LED_EN		BIT(0)
+#define GREEN_LED_EN		BIT(1)
+#define BLUE_LED_EN		BIT(2)
+#define LED_MASK		GENMASK(2, 0)
+#define MAX_BYTE_SIZE		8
+
+struct dlpc {
+	struct device		*dev;
+	struct drm_bridge	bridge;
+	struct drm_bridge	*next_bridge;
+	struct device_node	*host_node;
+	struct mipi_dsi_device	*dsi;
+	struct drm_display_mode	mode;
+
+	struct gpio_desc	*enable_gpio;
+	struct regulator	*vcc_intf;
+	struct regulator	*vcc_flsh;
+	struct regmap		*regmap;
+	unsigned int		dsi_lanes;
+};
+
+static inline struct dlpc *bridge_to_dlpc(struct drm_bridge *bridge)
+{
+	return container_of(bridge, struct dlpc, bridge);
+}
+
+static bool dlpc_writeable_noinc_reg(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case WR_IMAGE_CROP:
+	case WR_DISPLAY_SIZE:
+	case WR_INPUT_IMAGE_SIZE:
+	case WR_DSI_HS_CLK:
+		return true;
+	default:
+		return false;
+	}
+}
+
+static const struct regmap_range dlpc_volatile_ranges[] = {
+	{ .range_min = 0x10, .range_max = 0xBF },
+};
+
+static const struct regmap_access_table dlpc_volatile_table = {
+	.yes_ranges = dlpc_volatile_ranges,
+	.n_yes_ranges = ARRAY_SIZE(dlpc_volatile_ranges),
+};
+
+static struct regmap_config dlpc_regmap_config = {
+	.reg_bits		= 8,
+	.val_bits		= 8,
+	.max_register		= WR_DSI_PORT_EN,
+	.writeable_noinc_reg	= dlpc_writeable_noinc_reg,
+	.volatile_table		= &dlpc_volatile_table,
+	.cache_type		= REGCACHE_RBTREE,
+	.name			= "dlpc3433",
+};
+
+static void dlpc_atomic_enable(struct drm_bridge *bridge,
+			       struct drm_bridge_state *old_bridge_state)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+	struct device *dev = dlpc->dev;
+	struct drm_display_mode *mode = &dlpc->mode;
+	struct regmap *regmap = dlpc->regmap;
+	char buf[MAX_BYTE_SIZE];
+	unsigned int devid;
+
+	regmap_read(regmap, RD_DEVICE_ID, &devid);
+	devid &= DEV_ID_MASK;
+
+	DRM_DEV_DEBUG(dev, "DLPC3433 device id: 0x%02x\n", devid);
+
+	if (devid != 0x01) {
+		DRM_DEV_ERROR(dev, "Unsupported DLPC device id: 0x%02x\n", devid);
+		return;
+	}
+
+	/* disable image freeze */
+	regmap_write(regmap, WR_IMAGE_FREEZE, IMAGE_FREESE_EN);
+
+	/* enable DSI port */
+	regmap_write(regmap, WR_DSI_PORT_EN, DSI_PORT_EN);
+
+	memset(buf, 0, MAX_BYTE_SIZE);
+
+	/* set image crop */
+	buf[4] = mode->hdisplay & 0xff;
+	buf[5] = (mode->hdisplay & 0xff00) >> 8;
+	buf[6] = mode->vdisplay & 0xff;
+	buf[7] = (mode->vdisplay & 0xff00) >> 8;
+	regmap_noinc_write(regmap, WR_IMAGE_CROP, buf, MAX_BYTE_SIZE);
+
+	/* set display size */
+	buf[4] = mode->hdisplay & 0xff;
+	buf[5] = (mode->hdisplay & 0xff00) >> 8;
+	buf[6] = mode->vdisplay & 0xff;
+	buf[7] = (mode->vdisplay & 0xff00) >> 8;
+	regmap_noinc_write(regmap, WR_DISPLAY_SIZE, buf, MAX_BYTE_SIZE);
+
+	/* set input image size */
+	buf[0] = mode->hdisplay & 0xff;
+	buf[1] = (mode->hdisplay & 0xff00) >> 8;
+	buf[2] = mode->vdisplay & 0xff;
+	buf[3] = (mode->vdisplay & 0xff00) >> 8;
+	regmap_noinc_write(regmap, WR_INPUT_IMAGE_SIZE, buf, 4);
+
+	/* set external video port */
+	regmap_write(regmap, WR_INPUT_SOURCE, INPUT_EXTERNAL_VIDEO);
+
+	/* set external video format select as DSI */
+	regmap_write(regmap, WR_EXT_SOURCE_FMT, EXT_SOURCE_FMT_DSI);
+
+	/* disable image freeze */
+	regmap_write(regmap, WR_IMAGE_FREEZE, 0x00);
+
+	/* enable RGB led */
+	regmap_update_bits(regmap, WR_RGB_LED_EN, LED_MASK,
+			   RED_LED_EN | GREEN_LED_EN | BLUE_LED_EN);
+
+	msleep(10);
+}
+
+static void dlpc_atomic_pre_enable(struct drm_bridge *bridge,
+				   struct drm_bridge_state *old_bridge_state)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+	int ret;
+
+	gpiod_set_value(dlpc->enable_gpio, 1);
+
+	msleep(500);
+
+	ret = regulator_enable(dlpc->vcc_intf);
+	if (ret)
+		DRM_DEV_ERROR(dlpc->dev,
+			      "failed to enable VCC_INTF regulator: %d\n", ret);
+
+	ret = regulator_enable(dlpc->vcc_flsh);
+	if (ret)
+		DRM_DEV_ERROR(dlpc->dev,
+			      "failed to enable VCC_FLSH regulator: %d\n", ret);
+
+	msleep(10);
+}
+
+static void dlpc_atomic_post_disable(struct drm_bridge *bridge,
+				     struct drm_bridge_state *old_bridge_state)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+
+	regulator_disable(dlpc->vcc_flsh);
+	regulator_disable(dlpc->vcc_intf);
+
+	msleep(10);
+
+	gpiod_set_value(dlpc->enable_gpio, 0);
+
+	msleep(500);
+}
+
+#define MAX_INPUT_SEL_FORMATS	1
+
+static u32 *
+dlpc_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
+			       struct drm_bridge_state *bridge_state,
+			       struct drm_crtc_state *crtc_state,
+			       struct drm_connector_state *conn_state,
+			       u32 output_fmt,
+			       unsigned int *num_input_fmts)
+{
+	u32 *input_fmts;
+
+	*num_input_fmts = 0;
+
+	input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts),
+			     GFP_KERNEL);
+	if (!input_fmts)
+		return NULL;
+
+	/* This is the DSI-end bus format */
+	input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24;
+	*num_input_fmts = 1;
+
+	return input_fmts;
+}
+
+static void dlpc_mode_set(struct drm_bridge *bridge,
+			  const struct drm_display_mode *mode,
+			  const struct drm_display_mode *adjusted_mode)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+
+	drm_mode_copy(&dlpc->mode, adjusted_mode);
+}
+
+static int dlpc_attach(struct drm_bridge *bridge,
+		       enum drm_bridge_attach_flags flags)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+
+	return drm_bridge_attach(bridge->encoder, dlpc->next_bridge, bridge, flags);
+}
+
+static const struct drm_bridge_funcs dlpc_bridge_funcs = {
+	.atomic_duplicate_state		= drm_atomic_helper_bridge_duplicate_state,
+	.atomic_destroy_state		= drm_atomic_helper_bridge_destroy_state,
+	.atomic_get_input_bus_fmts	= dlpc_atomic_get_input_bus_fmts,
+	.atomic_reset			= drm_atomic_helper_bridge_reset,
+	.atomic_pre_enable		= dlpc_atomic_pre_enable,
+	.atomic_enable			= dlpc_atomic_enable,
+	.atomic_post_disable		= dlpc_atomic_post_disable,
+	.mode_set			= dlpc_mode_set,
+	.attach				= dlpc_attach,
+};
+
+static int dlpc3433_parse_dt(struct dlpc *dlpc)
+{
+	struct device *dev = dlpc->dev;
+	struct device_node *endpoint;
+	int ret;
+
+	dlpc->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
+	if (IS_ERR(dlpc->enable_gpio))
+		return PTR_ERR(dlpc->enable_gpio);
+
+	dlpc->vcc_intf = devm_regulator_get(dlpc->dev, "vcc_intf");
+	if (IS_ERR(dlpc->vcc_intf))
+		return dev_err_probe(dev, PTR_ERR(dlpc->vcc_intf),
+				     "failed to get VCC_INTF supply\n");
+
+	dlpc->vcc_flsh = devm_regulator_get(dlpc->dev, "vcc_flsh");
+	if (IS_ERR(dlpc->vcc_flsh))
+		return dev_err_probe(dev, PTR_ERR(dlpc->vcc_flsh),
+				     "failed to get VCC_FLSH supply\n");
+
+	dlpc->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
+	if (IS_ERR(dlpc->next_bridge))
+		return PTR_ERR(dlpc->next_bridge);
+
+	endpoint = of_graph_get_endpoint_by_regs(dev->of_node, 0, 0);
+	dlpc->dsi_lanes = of_property_count_u32_elems(endpoint, "data-lanes");
+	if (dlpc->dsi_lanes < 0 || dlpc->dsi_lanes > 4) {
+		ret = -EINVAL;
+		goto err_put_endpoint;
+	}
+
+	dlpc->host_node = of_graph_get_remote_port_parent(endpoint);
+	if (!dlpc->host_node) {
+		ret = -ENODEV;
+		goto err_put_host;
+	}
+
+	of_node_put(endpoint);
+
+	return 0;
+
+err_put_host:
+	of_node_put(dlpc->host_node);
+err_put_endpoint:
+	of_node_put(endpoint);
+	return ret;
+}
+
+static int dlpc_host_attach(struct dlpc *dlpc)
+{
+	struct device *dev = dlpc->dev;
+	struct mipi_dsi_host *host;
+	struct mipi_dsi_device_info info = {
+		.type = "dlpc3433",
+		.channel = 0,
+		.node = NULL,
+	};
+
+	host = of_find_mipi_dsi_host_by_node(dlpc->host_node);
+	if (!host) {
+		DRM_DEV_ERROR(dev, "failed to find dsi host\n");
+		return -EPROBE_DEFER;
+	}
+
+	dlpc->dsi = mipi_dsi_device_register_full(host, &info);
+	if (IS_ERR(dlpc->dsi)) {
+		DRM_DEV_ERROR(dev, "failed to create dsi device\n");
+		return PTR_ERR(dlpc->dsi);
+	}
+
+	dlpc->dsi->mode_flags = MIPI_DSI_MODE_VIDEO_BURST;
+	dlpc->dsi->format = MIPI_DSI_FMT_RGB565;
+	dlpc->dsi->lanes = dlpc->dsi_lanes;
+
+	return devm_mipi_dsi_attach(dev, dlpc->dsi);
+}
+
+static int dlpc3433_probe(struct i2c_client *client)
+{
+	struct device *dev = &client->dev;
+	struct dlpc *dlpc;
+	int ret;
+
+	dlpc = devm_kzalloc(dev, sizeof(*dlpc), GFP_KERNEL);
+	if (!dlpc)
+		return -ENOMEM;
+
+	dlpc->dev = dev;
+
+	dlpc->regmap = devm_regmap_init_i2c(client, &dlpc_regmap_config);
+	if (IS_ERR(dlpc->regmap))
+		return PTR_ERR(dlpc->regmap);
+
+	ret = dlpc3433_parse_dt(dlpc);
+	if (ret)
+		return ret;
+
+	dev_set_drvdata(dev, dlpc);
+	i2c_set_clientdata(client, dlpc);
+
+	dlpc->bridge.funcs = &dlpc_bridge_funcs;
+	dlpc->bridge.of_node = dev->of_node;
+	drm_bridge_add(&dlpc->bridge);
+
+	ret = dlpc_host_attach(dlpc);
+	if (ret) {
+		DRM_DEV_ERROR(dev, "failed to attach dsi host\n");
+		goto err_remove_bridge;
+	}
+
+	return 0;
+
+err_remove_bridge:
+	drm_bridge_remove(&dlpc->bridge);
+	return ret;
+}
+
+static int dlpc3433_remove(struct i2c_client *client)
+{
+	struct dlpc *dlpc = i2c_get_clientdata(client);
+
+	drm_bridge_remove(&dlpc->bridge);
+	of_node_put(dlpc->host_node);
+
+	return 0;
+}
+
+static const struct i2c_device_id dlpc3433_id[] = {
+	{ "ti,dlpc3433", 0 },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(i2c, dlpc3433_id);
+
+static const struct of_device_id dlpc3433_match_table[] = {
+	{ .compatible = "ti,dlpc3433" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, dlpc3433_match_table);
+
+static struct i2c_driver dlpc3433_driver = {
+	.probe_new = dlpc3433_probe,
+	.remove = dlpc3433_remove,
+	.id_table = dlpc3433_id,
+	.driver = {
+		.name = "ti-dlpc3433",
+		.of_match_table = dlpc3433_match_table,
+	},
+};
+module_i2c_driver(dlpc3433_driver);
+
+MODULE_AUTHOR("Jagan Teki <jagan@amarulasolutions.com>");
+MODULE_AUTHOR("Christopher Vollo <chris@renewoutreach.org>");
+MODULE_DESCRIPTION("TI DLPC3433 MIPI DSI Display Controller Bridge");
+MODULE_LICENSE("GPL");
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v3 2/2] drm: bridge: Add TI DLPC3433 DSI to DMD bridge
@ 2022-06-03 14:03   ` Jagan Teki
  0 siblings, 0 replies; 8+ messages in thread
From: Jagan Teki @ 2022-06-03 14:03 UTC (permalink / raw)
  To: Rob Herring, Andrzej Hajda, Neil Armstrong, Robert Foss,
	Laurent Pinchart
  Cc: devicetree, Christopher Vollo, linux-amarula, dri-devel,
	Jagan Teki, Sam Ravnborg

TI DLPC3433 is a MIPI DSI based display controller bridge
for processing high resolution DMD based projectors.

It has a flexible configuration of MIPI DSI and DPI signal
input that produces a DMD output in RGB565, RGB666, RGB888
formats.

It supports upto 720p resolution with 60 and 120 Hz refresh
rates.

Add bridge driver for it.

Signed-off-by: Christopher Vollo <chris@renewoutreach.org>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v3:
- none
Changes for v2:
- fixed license
- filled display size buffer
- fixed power off
- fixed dev_err_probe

 MAINTAINERS                          |   1 +
 drivers/gpu/drm/bridge/Kconfig       |  16 +
 drivers/gpu/drm/bridge/Makefile      |   1 +
 drivers/gpu/drm/bridge/ti-dlpc3433.c | 417 +++++++++++++++++++++++++++
 4 files changed, 435 insertions(+)
 create mode 100644 drivers/gpu/drm/bridge/ti-dlpc3433.c

diff --git a/MAINTAINERS b/MAINTAINERS
index aea0fe5156af..ede21cc48708 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6435,6 +6435,7 @@ DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
 M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
+F:	drivers/gpu/drm/bridge/ti-dlpc3433.c
 
 DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
 R:	Douglas Anderson <dianders@chromium.org>
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 146ab069838f..4b28f939fff6 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -321,6 +321,22 @@ config DRM_TOSHIBA_TC358775
 	help
 	  Toshiba TC358775 DSI/LVDS bridge chip driver.
 
+config DRM_TI_DLPC3433
+	tristate "TI DLPC3433 Display controller"
+	depends on DRM && DRM_PANEL
+	depends on OF
+	select DRM_MIPI_DSI
+	help
+	  TI DLPC3433 is a MIPI DSI based display controller bridge
+	  for processing high resolution DMD based projectors.
+
+	  It has a flexible configuration of MIPI DSI and DPI signal
+	  input that produces a DMD output in RGB565, RGB666, RGB888
+	  formats.
+
+	  It supports upto 720p resolution with 60 and 120 Hz refresh
+	  rates.
+
 config DRM_TI_TFP410
 	tristate "TI TFP410 DVI/HDMI bridge"
 	depends on OF
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index f6c0a95de549..043b499545e3 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_DRM_TOSHIBA_TC358767) += tc358767.o
 obj-$(CONFIG_DRM_TOSHIBA_TC358768) += tc358768.o
 obj-$(CONFIG_DRM_TOSHIBA_TC358775) += tc358775.o
 obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
+obj-$(CONFIG_DRM_TI_DLPC3433) += ti-dlpc3433.o
 obj-$(CONFIG_DRM_TI_SN65DSI83) += ti-sn65dsi83.o
 obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o
 obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/ti-dlpc3433.c
new file mode 100644
index 000000000000..06e519798ac5
--- /dev/null
+++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c
@@ -0,0 +1,417 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2021 RenewOutReach
+ * Copyright (C) 2021 Amarula Solutions(India)
+ *
+ * Author:
+ * Jagan Teki <jagan@amarulasolutions.com>
+ * Christopher Vollo <chris@renewoutreach.org>
+ */
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_print.h>
+#include <drm/drm_mipi_dsi.h>
+
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
+enum cmd_registers {
+	WR_INPUT_SOURCE		= 0x05,	/* Write Input Source Select */
+	WR_EXT_SOURCE_FMT	= 0x07, /* Write External Video Source Format */
+	WR_IMAGE_CROP		= 0x10,	/* Write Image Crop */
+	WR_DISPLAY_SIZE		= 0x12,	/* Write Display Size */
+	WR_IMAGE_FREEZE		= 0x1A,	/* Write Image Freeze */
+	WR_INPUT_IMAGE_SIZE	= 0x2E,	/* Write External Input Image Size */
+	WR_RGB_LED_EN		= 0x52,	/* Write RGB LED Enable */
+	WR_RGB_LED_CURRENT	= 0x54,	/* Write RGB LED Current */
+	WR_RGB_LED_MAX_CURRENT	= 0x5C,	/* Write RGB LED Max Current */
+	WR_DSI_HS_CLK		= 0xBD,	/* Write DSI HS Clock */
+	RD_DEVICE_ID		= 0xD4,	/* Read Controller Device ID */
+	WR_DSI_PORT_EN		= 0xD7,	/* Write DSI Port Enable */
+};
+
+enum input_source {
+	INPUT_EXTERNAL_VIDEO	= 0,
+	INPUT_TEST_PATTERN,
+	INPUT_SPLASH_SCREEN,
+};
+
+#define DEV_ID_MASK		GENMASK(3, 0)
+#define IMAGE_FREESE_EN		BIT(0)
+#define DSI_PORT_EN		0
+#define EXT_SOURCE_FMT_DSI	0
+#define RED_LED_EN		BIT(0)
+#define GREEN_LED_EN		BIT(1)
+#define BLUE_LED_EN		BIT(2)
+#define LED_MASK		GENMASK(2, 0)
+#define MAX_BYTE_SIZE		8
+
+struct dlpc {
+	struct device		*dev;
+	struct drm_bridge	bridge;
+	struct drm_bridge	*next_bridge;
+	struct device_node	*host_node;
+	struct mipi_dsi_device	*dsi;
+	struct drm_display_mode	mode;
+
+	struct gpio_desc	*enable_gpio;
+	struct regulator	*vcc_intf;
+	struct regulator	*vcc_flsh;
+	struct regmap		*regmap;
+	unsigned int		dsi_lanes;
+};
+
+static inline struct dlpc *bridge_to_dlpc(struct drm_bridge *bridge)
+{
+	return container_of(bridge, struct dlpc, bridge);
+}
+
+static bool dlpc_writeable_noinc_reg(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case WR_IMAGE_CROP:
+	case WR_DISPLAY_SIZE:
+	case WR_INPUT_IMAGE_SIZE:
+	case WR_DSI_HS_CLK:
+		return true;
+	default:
+		return false;
+	}
+}
+
+static const struct regmap_range dlpc_volatile_ranges[] = {
+	{ .range_min = 0x10, .range_max = 0xBF },
+};
+
+static const struct regmap_access_table dlpc_volatile_table = {
+	.yes_ranges = dlpc_volatile_ranges,
+	.n_yes_ranges = ARRAY_SIZE(dlpc_volatile_ranges),
+};
+
+static struct regmap_config dlpc_regmap_config = {
+	.reg_bits		= 8,
+	.val_bits		= 8,
+	.max_register		= WR_DSI_PORT_EN,
+	.writeable_noinc_reg	= dlpc_writeable_noinc_reg,
+	.volatile_table		= &dlpc_volatile_table,
+	.cache_type		= REGCACHE_RBTREE,
+	.name			= "dlpc3433",
+};
+
+static void dlpc_atomic_enable(struct drm_bridge *bridge,
+			       struct drm_bridge_state *old_bridge_state)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+	struct device *dev = dlpc->dev;
+	struct drm_display_mode *mode = &dlpc->mode;
+	struct regmap *regmap = dlpc->regmap;
+	char buf[MAX_BYTE_SIZE];
+	unsigned int devid;
+
+	regmap_read(regmap, RD_DEVICE_ID, &devid);
+	devid &= DEV_ID_MASK;
+
+	DRM_DEV_DEBUG(dev, "DLPC3433 device id: 0x%02x\n", devid);
+
+	if (devid != 0x01) {
+		DRM_DEV_ERROR(dev, "Unsupported DLPC device id: 0x%02x\n", devid);
+		return;
+	}
+
+	/* disable image freeze */
+	regmap_write(regmap, WR_IMAGE_FREEZE, IMAGE_FREESE_EN);
+
+	/* enable DSI port */
+	regmap_write(regmap, WR_DSI_PORT_EN, DSI_PORT_EN);
+
+	memset(buf, 0, MAX_BYTE_SIZE);
+
+	/* set image crop */
+	buf[4] = mode->hdisplay & 0xff;
+	buf[5] = (mode->hdisplay & 0xff00) >> 8;
+	buf[6] = mode->vdisplay & 0xff;
+	buf[7] = (mode->vdisplay & 0xff00) >> 8;
+	regmap_noinc_write(regmap, WR_IMAGE_CROP, buf, MAX_BYTE_SIZE);
+
+	/* set display size */
+	buf[4] = mode->hdisplay & 0xff;
+	buf[5] = (mode->hdisplay & 0xff00) >> 8;
+	buf[6] = mode->vdisplay & 0xff;
+	buf[7] = (mode->vdisplay & 0xff00) >> 8;
+	regmap_noinc_write(regmap, WR_DISPLAY_SIZE, buf, MAX_BYTE_SIZE);
+
+	/* set input image size */
+	buf[0] = mode->hdisplay & 0xff;
+	buf[1] = (mode->hdisplay & 0xff00) >> 8;
+	buf[2] = mode->vdisplay & 0xff;
+	buf[3] = (mode->vdisplay & 0xff00) >> 8;
+	regmap_noinc_write(regmap, WR_INPUT_IMAGE_SIZE, buf, 4);
+
+	/* set external video port */
+	regmap_write(regmap, WR_INPUT_SOURCE, INPUT_EXTERNAL_VIDEO);
+
+	/* set external video format select as DSI */
+	regmap_write(regmap, WR_EXT_SOURCE_FMT, EXT_SOURCE_FMT_DSI);
+
+	/* disable image freeze */
+	regmap_write(regmap, WR_IMAGE_FREEZE, 0x00);
+
+	/* enable RGB led */
+	regmap_update_bits(regmap, WR_RGB_LED_EN, LED_MASK,
+			   RED_LED_EN | GREEN_LED_EN | BLUE_LED_EN);
+
+	msleep(10);
+}
+
+static void dlpc_atomic_pre_enable(struct drm_bridge *bridge,
+				   struct drm_bridge_state *old_bridge_state)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+	int ret;
+
+	gpiod_set_value(dlpc->enable_gpio, 1);
+
+	msleep(500);
+
+	ret = regulator_enable(dlpc->vcc_intf);
+	if (ret)
+		DRM_DEV_ERROR(dlpc->dev,
+			      "failed to enable VCC_INTF regulator: %d\n", ret);
+
+	ret = regulator_enable(dlpc->vcc_flsh);
+	if (ret)
+		DRM_DEV_ERROR(dlpc->dev,
+			      "failed to enable VCC_FLSH regulator: %d\n", ret);
+
+	msleep(10);
+}
+
+static void dlpc_atomic_post_disable(struct drm_bridge *bridge,
+				     struct drm_bridge_state *old_bridge_state)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+
+	regulator_disable(dlpc->vcc_flsh);
+	regulator_disable(dlpc->vcc_intf);
+
+	msleep(10);
+
+	gpiod_set_value(dlpc->enable_gpio, 0);
+
+	msleep(500);
+}
+
+#define MAX_INPUT_SEL_FORMATS	1
+
+static u32 *
+dlpc_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
+			       struct drm_bridge_state *bridge_state,
+			       struct drm_crtc_state *crtc_state,
+			       struct drm_connector_state *conn_state,
+			       u32 output_fmt,
+			       unsigned int *num_input_fmts)
+{
+	u32 *input_fmts;
+
+	*num_input_fmts = 0;
+
+	input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts),
+			     GFP_KERNEL);
+	if (!input_fmts)
+		return NULL;
+
+	/* This is the DSI-end bus format */
+	input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24;
+	*num_input_fmts = 1;
+
+	return input_fmts;
+}
+
+static void dlpc_mode_set(struct drm_bridge *bridge,
+			  const struct drm_display_mode *mode,
+			  const struct drm_display_mode *adjusted_mode)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+
+	drm_mode_copy(&dlpc->mode, adjusted_mode);
+}
+
+static int dlpc_attach(struct drm_bridge *bridge,
+		       enum drm_bridge_attach_flags flags)
+{
+	struct dlpc *dlpc = bridge_to_dlpc(bridge);
+
+	return drm_bridge_attach(bridge->encoder, dlpc->next_bridge, bridge, flags);
+}
+
+static const struct drm_bridge_funcs dlpc_bridge_funcs = {
+	.atomic_duplicate_state		= drm_atomic_helper_bridge_duplicate_state,
+	.atomic_destroy_state		= drm_atomic_helper_bridge_destroy_state,
+	.atomic_get_input_bus_fmts	= dlpc_atomic_get_input_bus_fmts,
+	.atomic_reset			= drm_atomic_helper_bridge_reset,
+	.atomic_pre_enable		= dlpc_atomic_pre_enable,
+	.atomic_enable			= dlpc_atomic_enable,
+	.atomic_post_disable		= dlpc_atomic_post_disable,
+	.mode_set			= dlpc_mode_set,
+	.attach				= dlpc_attach,
+};
+
+static int dlpc3433_parse_dt(struct dlpc *dlpc)
+{
+	struct device *dev = dlpc->dev;
+	struct device_node *endpoint;
+	int ret;
+
+	dlpc->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
+	if (IS_ERR(dlpc->enable_gpio))
+		return PTR_ERR(dlpc->enable_gpio);
+
+	dlpc->vcc_intf = devm_regulator_get(dlpc->dev, "vcc_intf");
+	if (IS_ERR(dlpc->vcc_intf))
+		return dev_err_probe(dev, PTR_ERR(dlpc->vcc_intf),
+				     "failed to get VCC_INTF supply\n");
+
+	dlpc->vcc_flsh = devm_regulator_get(dlpc->dev, "vcc_flsh");
+	if (IS_ERR(dlpc->vcc_flsh))
+		return dev_err_probe(dev, PTR_ERR(dlpc->vcc_flsh),
+				     "failed to get VCC_FLSH supply\n");
+
+	dlpc->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
+	if (IS_ERR(dlpc->next_bridge))
+		return PTR_ERR(dlpc->next_bridge);
+
+	endpoint = of_graph_get_endpoint_by_regs(dev->of_node, 0, 0);
+	dlpc->dsi_lanes = of_property_count_u32_elems(endpoint, "data-lanes");
+	if (dlpc->dsi_lanes < 0 || dlpc->dsi_lanes > 4) {
+		ret = -EINVAL;
+		goto err_put_endpoint;
+	}
+
+	dlpc->host_node = of_graph_get_remote_port_parent(endpoint);
+	if (!dlpc->host_node) {
+		ret = -ENODEV;
+		goto err_put_host;
+	}
+
+	of_node_put(endpoint);
+
+	return 0;
+
+err_put_host:
+	of_node_put(dlpc->host_node);
+err_put_endpoint:
+	of_node_put(endpoint);
+	return ret;
+}
+
+static int dlpc_host_attach(struct dlpc *dlpc)
+{
+	struct device *dev = dlpc->dev;
+	struct mipi_dsi_host *host;
+	struct mipi_dsi_device_info info = {
+		.type = "dlpc3433",
+		.channel = 0,
+		.node = NULL,
+	};
+
+	host = of_find_mipi_dsi_host_by_node(dlpc->host_node);
+	if (!host) {
+		DRM_DEV_ERROR(dev, "failed to find dsi host\n");
+		return -EPROBE_DEFER;
+	}
+
+	dlpc->dsi = mipi_dsi_device_register_full(host, &info);
+	if (IS_ERR(dlpc->dsi)) {
+		DRM_DEV_ERROR(dev, "failed to create dsi device\n");
+		return PTR_ERR(dlpc->dsi);
+	}
+
+	dlpc->dsi->mode_flags = MIPI_DSI_MODE_VIDEO_BURST;
+	dlpc->dsi->format = MIPI_DSI_FMT_RGB565;
+	dlpc->dsi->lanes = dlpc->dsi_lanes;
+
+	return devm_mipi_dsi_attach(dev, dlpc->dsi);
+}
+
+static int dlpc3433_probe(struct i2c_client *client)
+{
+	struct device *dev = &client->dev;
+	struct dlpc *dlpc;
+	int ret;
+
+	dlpc = devm_kzalloc(dev, sizeof(*dlpc), GFP_KERNEL);
+	if (!dlpc)
+		return -ENOMEM;
+
+	dlpc->dev = dev;
+
+	dlpc->regmap = devm_regmap_init_i2c(client, &dlpc_regmap_config);
+	if (IS_ERR(dlpc->regmap))
+		return PTR_ERR(dlpc->regmap);
+
+	ret = dlpc3433_parse_dt(dlpc);
+	if (ret)
+		return ret;
+
+	dev_set_drvdata(dev, dlpc);
+	i2c_set_clientdata(client, dlpc);
+
+	dlpc->bridge.funcs = &dlpc_bridge_funcs;
+	dlpc->bridge.of_node = dev->of_node;
+	drm_bridge_add(&dlpc->bridge);
+
+	ret = dlpc_host_attach(dlpc);
+	if (ret) {
+		DRM_DEV_ERROR(dev, "failed to attach dsi host\n");
+		goto err_remove_bridge;
+	}
+
+	return 0;
+
+err_remove_bridge:
+	drm_bridge_remove(&dlpc->bridge);
+	return ret;
+}
+
+static int dlpc3433_remove(struct i2c_client *client)
+{
+	struct dlpc *dlpc = i2c_get_clientdata(client);
+
+	drm_bridge_remove(&dlpc->bridge);
+	of_node_put(dlpc->host_node);
+
+	return 0;
+}
+
+static const struct i2c_device_id dlpc3433_id[] = {
+	{ "ti,dlpc3433", 0 },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(i2c, dlpc3433_id);
+
+static const struct of_device_id dlpc3433_match_table[] = {
+	{ .compatible = "ti,dlpc3433" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, dlpc3433_match_table);
+
+static struct i2c_driver dlpc3433_driver = {
+	.probe_new = dlpc3433_probe,
+	.remove = dlpc3433_remove,
+	.id_table = dlpc3433_id,
+	.driver = {
+		.name = "ti-dlpc3433",
+		.of_match_table = dlpc3433_match_table,
+	},
+};
+module_i2c_driver(dlpc3433_driver);
+
+MODULE_AUTHOR("Jagan Teki <jagan@amarulasolutions.com>");
+MODULE_AUTHOR("Christopher Vollo <chris@renewoutreach.org>");
+MODULE_DESCRIPTION("TI DLPC3433 MIPI DSI Display Controller Bridge");
+MODULE_LICENSE("GPL");
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 2/2] drm: bridge: Add TI DLPC3433 DSI to DMD bridge
  2022-06-03 14:03   ` Jagan Teki
@ 2022-06-03 14:37     ` Robert Foss
  -1 siblings, 0 replies; 8+ messages in thread
From: Robert Foss @ 2022-06-03 14:37 UTC (permalink / raw)
  To: Jagan Teki
  Cc: Rob Herring, Andrzej Hajda, Neil Armstrong, Laurent Pinchart,
	Sam Ravnborg, dri-devel, devicetree, linux-amarula,
	Christopher Vollo

On Fri, 3 Jun 2022 at 16:04, Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> TI DLPC3433 is a MIPI DSI based display controller bridge
> for processing high resolution DMD based projectors.
>
> It has a flexible configuration of MIPI DSI and DPI signal
> input that produces a DMD output in RGB565, RGB666, RGB888
> formats.
>
> It supports upto 720p resolution with 60 and 120 Hz refresh
> rates.
>
> Add bridge driver for it.
>
> Signed-off-by: Christopher Vollo <chris@renewoutreach.org>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v3:
> - none
> Changes for v2:
> - fixed license
> - filled display size buffer
> - fixed power off
> - fixed dev_err_probe
>
>  MAINTAINERS                          |   1 +
>  drivers/gpu/drm/bridge/Kconfig       |  16 +
>  drivers/gpu/drm/bridge/Makefile      |   1 +
>  drivers/gpu/drm/bridge/ti-dlpc3433.c | 417 +++++++++++++++++++++++++++
>  4 files changed, 435 insertions(+)
>  create mode 100644 drivers/gpu/drm/bridge/ti-dlpc3433.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index aea0fe5156af..ede21cc48708 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -6435,6 +6435,7 @@ DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
>  M:     Jagan Teki <jagan@amarulasolutions.com>
>  S:     Maintained
>  F:     Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
> +F:     drivers/gpu/drm/bridge/ti-dlpc3433.c
>
>  DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
>  R:     Douglas Anderson <dianders@chromium.org>
> diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
> index 146ab069838f..4b28f939fff6 100644
> --- a/drivers/gpu/drm/bridge/Kconfig
> +++ b/drivers/gpu/drm/bridge/Kconfig
> @@ -321,6 +321,22 @@ config DRM_TOSHIBA_TC358775
>         help
>           Toshiba TC358775 DSI/LVDS bridge chip driver.
>
> +config DRM_TI_DLPC3433
> +       tristate "TI DLPC3433 Display controller"
> +       depends on DRM && DRM_PANEL
> +       depends on OF
> +       select DRM_MIPI_DSI
> +       help
> +         TI DLPC3433 is a MIPI DSI based display controller bridge
> +         for processing high resolution DMD based projectors.
> +
> +         It has a flexible configuration of MIPI DSI and DPI signal
> +         input that produces a DMD output in RGB565, RGB666, RGB888
> +         formats.
> +
> +         It supports upto 720p resolution with 60 and 120 Hz refresh
> +         rates.
> +
>  config DRM_TI_TFP410
>         tristate "TI TFP410 DVI/HDMI bridge"
>         depends on OF
> diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
> index f6c0a95de549..043b499545e3 100644
> --- a/drivers/gpu/drm/bridge/Makefile
> +++ b/drivers/gpu/drm/bridge/Makefile
> @@ -26,6 +26,7 @@ obj-$(CONFIG_DRM_TOSHIBA_TC358767) += tc358767.o
>  obj-$(CONFIG_DRM_TOSHIBA_TC358768) += tc358768.o
>  obj-$(CONFIG_DRM_TOSHIBA_TC358775) += tc358775.o
>  obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
> +obj-$(CONFIG_DRM_TI_DLPC3433) += ti-dlpc3433.o
>  obj-$(CONFIG_DRM_TI_SN65DSI83) += ti-sn65dsi83.o
>  obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o
>  obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
> diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> new file mode 100644
> index 000000000000..06e519798ac5
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> @@ -0,0 +1,417 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2021 RenewOutReach
> + * Copyright (C) 2021 Amarula Solutions(India)
> + *
> + * Author:
> + * Jagan Teki <jagan@amarulasolutions.com>
> + * Christopher Vollo <chris@renewoutreach.org>
> + */
> +
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_of.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_mipi_dsi.h>
> +
> +#include <linux/delay.h>
> +#include <linux/gpio/consumer.h>
> +#include <linux/i2c.h>
> +#include <linux/module.h>
> +#include <linux/regmap.h>
> +#include <linux/regulator/consumer.h>
> +
> +enum cmd_registers {
> +       WR_INPUT_SOURCE         = 0x05, /* Write Input Source Select */
> +       WR_EXT_SOURCE_FMT       = 0x07, /* Write External Video Source Format */
> +       WR_IMAGE_CROP           = 0x10, /* Write Image Crop */
> +       WR_DISPLAY_SIZE         = 0x12, /* Write Display Size */
> +       WR_IMAGE_FREEZE         = 0x1A, /* Write Image Freeze */
> +       WR_INPUT_IMAGE_SIZE     = 0x2E, /* Write External Input Image Size */
> +       WR_RGB_LED_EN           = 0x52, /* Write RGB LED Enable */
> +       WR_RGB_LED_CURRENT      = 0x54, /* Write RGB LED Current */
> +       WR_RGB_LED_MAX_CURRENT  = 0x5C, /* Write RGB LED Max Current */
> +       WR_DSI_HS_CLK           = 0xBD, /* Write DSI HS Clock */
> +       RD_DEVICE_ID            = 0xD4, /* Read Controller Device ID */
> +       WR_DSI_PORT_EN          = 0xD7, /* Write DSI Port Enable */
> +};
> +
> +enum input_source {
> +       INPUT_EXTERNAL_VIDEO    = 0,
> +       INPUT_TEST_PATTERN,
> +       INPUT_SPLASH_SCREEN,
> +};
> +
> +#define DEV_ID_MASK            GENMASK(3, 0)
> +#define IMAGE_FREESE_EN                BIT(0)
> +#define DSI_PORT_EN            0
> +#define EXT_SOURCE_FMT_DSI     0
> +#define RED_LED_EN             BIT(0)
> +#define GREEN_LED_EN           BIT(1)
> +#define BLUE_LED_EN            BIT(2)
> +#define LED_MASK               GENMASK(2, 0)
> +#define MAX_BYTE_SIZE          8
> +
> +struct dlpc {
> +       struct device           *dev;
> +       struct drm_bridge       bridge;
> +       struct drm_bridge       *next_bridge;
> +       struct device_node      *host_node;
> +       struct mipi_dsi_device  *dsi;
> +       struct drm_display_mode mode;
> +
> +       struct gpio_desc        *enable_gpio;
> +       struct regulator        *vcc_intf;
> +       struct regulator        *vcc_flsh;
> +       struct regmap           *regmap;
> +       unsigned int            dsi_lanes;
> +};
> +
> +static inline struct dlpc *bridge_to_dlpc(struct drm_bridge *bridge)
> +{
> +       return container_of(bridge, struct dlpc, bridge);
> +}
> +
> +static bool dlpc_writeable_noinc_reg(struct device *dev, unsigned int reg)
> +{
> +       switch (reg) {
> +       case WR_IMAGE_CROP:
> +       case WR_DISPLAY_SIZE:
> +       case WR_INPUT_IMAGE_SIZE:
> +       case WR_DSI_HS_CLK:
> +               return true;
> +       default:
> +               return false;
> +       }
> +}
> +
> +static const struct regmap_range dlpc_volatile_ranges[] = {
> +       { .range_min = 0x10, .range_max = 0xBF },
> +};
> +
> +static const struct regmap_access_table dlpc_volatile_table = {
> +       .yes_ranges = dlpc_volatile_ranges,
> +       .n_yes_ranges = ARRAY_SIZE(dlpc_volatile_ranges),
> +};
> +
> +static struct regmap_config dlpc_regmap_config = {
> +       .reg_bits               = 8,
> +       .val_bits               = 8,
> +       .max_register           = WR_DSI_PORT_EN,
> +       .writeable_noinc_reg    = dlpc_writeable_noinc_reg,
> +       .volatile_table         = &dlpc_volatile_table,
> +       .cache_type             = REGCACHE_RBTREE,
> +       .name                   = "dlpc3433",
> +};
> +
> +static void dlpc_atomic_enable(struct drm_bridge *bridge,
> +                              struct drm_bridge_state *old_bridge_state)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +       struct device *dev = dlpc->dev;
> +       struct drm_display_mode *mode = &dlpc->mode;
> +       struct regmap *regmap = dlpc->regmap;
> +       char buf[MAX_BYTE_SIZE];
> +       unsigned int devid;
> +
> +       regmap_read(regmap, RD_DEVICE_ID, &devid);
> +       devid &= DEV_ID_MASK;
> +
> +       DRM_DEV_DEBUG(dev, "DLPC3433 device id: 0x%02x\n", devid);
> +
> +       if (devid != 0x01) {
> +               DRM_DEV_ERROR(dev, "Unsupported DLPC device id: 0x%02x\n", devid);
> +               return;
> +       }
> +
> +       /* disable image freeze */
> +       regmap_write(regmap, WR_IMAGE_FREEZE, IMAGE_FREESE_EN);
> +
> +       /* enable DSI port */
> +       regmap_write(regmap, WR_DSI_PORT_EN, DSI_PORT_EN);
> +
> +       memset(buf, 0, MAX_BYTE_SIZE);
> +
> +       /* set image crop */
> +       buf[4] = mode->hdisplay & 0xff;
> +       buf[5] = (mode->hdisplay & 0xff00) >> 8;
> +       buf[6] = mode->vdisplay & 0xff;
> +       buf[7] = (mode->vdisplay & 0xff00) >> 8;
> +       regmap_noinc_write(regmap, WR_IMAGE_CROP, buf, MAX_BYTE_SIZE);
> +
> +       /* set display size */
> +       buf[4] = mode->hdisplay & 0xff;
> +       buf[5] = (mode->hdisplay & 0xff00) >> 8;
> +       buf[6] = mode->vdisplay & 0xff;
> +       buf[7] = (mode->vdisplay & 0xff00) >> 8;
> +       regmap_noinc_write(regmap, WR_DISPLAY_SIZE, buf, MAX_BYTE_SIZE);
> +
> +       /* set input image size */
> +       buf[0] = mode->hdisplay & 0xff;
> +       buf[1] = (mode->hdisplay & 0xff00) >> 8;
> +       buf[2] = mode->vdisplay & 0xff;
> +       buf[3] = (mode->vdisplay & 0xff00) >> 8;
> +       regmap_noinc_write(regmap, WR_INPUT_IMAGE_SIZE, buf, 4);
> +
> +       /* set external video port */
> +       regmap_write(regmap, WR_INPUT_SOURCE, INPUT_EXTERNAL_VIDEO);
> +
> +       /* set external video format select as DSI */
> +       regmap_write(regmap, WR_EXT_SOURCE_FMT, EXT_SOURCE_FMT_DSI);
> +
> +       /* disable image freeze */
> +       regmap_write(regmap, WR_IMAGE_FREEZE, 0x00);
> +
> +       /* enable RGB led */
> +       regmap_update_bits(regmap, WR_RGB_LED_EN, LED_MASK,
> +                          RED_LED_EN | GREEN_LED_EN | BLUE_LED_EN);
> +
> +       msleep(10);
> +}
> +
> +static void dlpc_atomic_pre_enable(struct drm_bridge *bridge,
> +                                  struct drm_bridge_state *old_bridge_state)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +       int ret;
> +
> +       gpiod_set_value(dlpc->enable_gpio, 1);
> +
> +       msleep(500);
> +
> +       ret = regulator_enable(dlpc->vcc_intf);
> +       if (ret)
> +               DRM_DEV_ERROR(dlpc->dev,
> +                             "failed to enable VCC_INTF regulator: %d\n", ret);
> +
> +       ret = regulator_enable(dlpc->vcc_flsh);
> +       if (ret)
> +               DRM_DEV_ERROR(dlpc->dev,
> +                             "failed to enable VCC_FLSH regulator: %d\n", ret);
> +
> +       msleep(10);
> +}
> +
> +static void dlpc_atomic_post_disable(struct drm_bridge *bridge,
> +                                    struct drm_bridge_state *old_bridge_state)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +
> +       regulator_disable(dlpc->vcc_flsh);
> +       regulator_disable(dlpc->vcc_intf);
> +
> +       msleep(10);
> +
> +       gpiod_set_value(dlpc->enable_gpio, 0);
> +
> +       msleep(500);
> +}
> +
> +#define MAX_INPUT_SEL_FORMATS  1
> +
> +static u32 *
> +dlpc_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
> +                              struct drm_bridge_state *bridge_state,
> +                              struct drm_crtc_state *crtc_state,
> +                              struct drm_connector_state *conn_state,
> +                              u32 output_fmt,
> +                              unsigned int *num_input_fmts)
> +{
> +       u32 *input_fmts;
> +
> +       *num_input_fmts = 0;
> +
> +       input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts),
> +                            GFP_KERNEL);
> +       if (!input_fmts)
> +               return NULL;
> +
> +       /* This is the DSI-end bus format */
> +       input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24;
> +       *num_input_fmts = 1;
> +
> +       return input_fmts;
> +}
> +
> +static void dlpc_mode_set(struct drm_bridge *bridge,
> +                         const struct drm_display_mode *mode,
> +                         const struct drm_display_mode *adjusted_mode)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +
> +       drm_mode_copy(&dlpc->mode, adjusted_mode);
> +}
> +
> +static int dlpc_attach(struct drm_bridge *bridge,
> +                      enum drm_bridge_attach_flags flags)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +
> +       return drm_bridge_attach(bridge->encoder, dlpc->next_bridge, bridge, flags);
> +}
> +
> +static const struct drm_bridge_funcs dlpc_bridge_funcs = {
> +       .atomic_duplicate_state         = drm_atomic_helper_bridge_duplicate_state,
> +       .atomic_destroy_state           = drm_atomic_helper_bridge_destroy_state,
> +       .atomic_get_input_bus_fmts      = dlpc_atomic_get_input_bus_fmts,
> +       .atomic_reset                   = drm_atomic_helper_bridge_reset,
> +       .atomic_pre_enable              = dlpc_atomic_pre_enable,
> +       .atomic_enable                  = dlpc_atomic_enable,
> +       .atomic_post_disable            = dlpc_atomic_post_disable,
> +       .mode_set                       = dlpc_mode_set,
> +       .attach                         = dlpc_attach,
> +};
> +
> +static int dlpc3433_parse_dt(struct dlpc *dlpc)
> +{
> +       struct device *dev = dlpc->dev;
> +       struct device_node *endpoint;
> +       int ret;
> +
> +       dlpc->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
> +       if (IS_ERR(dlpc->enable_gpio))
> +               return PTR_ERR(dlpc->enable_gpio);
> +
> +       dlpc->vcc_intf = devm_regulator_get(dlpc->dev, "vcc_intf");
> +       if (IS_ERR(dlpc->vcc_intf))
> +               return dev_err_probe(dev, PTR_ERR(dlpc->vcc_intf),
> +                                    "failed to get VCC_INTF supply\n");
> +
> +       dlpc->vcc_flsh = devm_regulator_get(dlpc->dev, "vcc_flsh");
> +       if (IS_ERR(dlpc->vcc_flsh))
> +               return dev_err_probe(dev, PTR_ERR(dlpc->vcc_flsh),
> +                                    "failed to get VCC_FLSH supply\n");
> +
> +       dlpc->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
> +       if (IS_ERR(dlpc->next_bridge))
> +               return PTR_ERR(dlpc->next_bridge);
> +
> +       endpoint = of_graph_get_endpoint_by_regs(dev->of_node, 0, 0);
> +       dlpc->dsi_lanes = of_property_count_u32_elems(endpoint, "data-lanes");
> +       if (dlpc->dsi_lanes < 0 || dlpc->dsi_lanes > 4) {
> +               ret = -EINVAL;
> +               goto err_put_endpoint;
> +       }
> +
> +       dlpc->host_node = of_graph_get_remote_port_parent(endpoint);
> +       if (!dlpc->host_node) {
> +               ret = -ENODEV;
> +               goto err_put_host;
> +       }
> +
> +       of_node_put(endpoint);
> +
> +       return 0;
> +
> +err_put_host:
> +       of_node_put(dlpc->host_node);
> +err_put_endpoint:
> +       of_node_put(endpoint);
> +       return ret;
> +}
> +
> +static int dlpc_host_attach(struct dlpc *dlpc)
> +{
> +       struct device *dev = dlpc->dev;
> +       struct mipi_dsi_host *host;
> +       struct mipi_dsi_device_info info = {
> +               .type = "dlpc3433",
> +               .channel = 0,
> +               .node = NULL,
> +       };
> +
> +       host = of_find_mipi_dsi_host_by_node(dlpc->host_node);
> +       if (!host) {
> +               DRM_DEV_ERROR(dev, "failed to find dsi host\n");
> +               return -EPROBE_DEFER;
> +       }
> +
> +       dlpc->dsi = mipi_dsi_device_register_full(host, &info);
> +       if (IS_ERR(dlpc->dsi)) {
> +               DRM_DEV_ERROR(dev, "failed to create dsi device\n");
> +               return PTR_ERR(dlpc->dsi);
> +       }
> +
> +       dlpc->dsi->mode_flags = MIPI_DSI_MODE_VIDEO_BURST;
> +       dlpc->dsi->format = MIPI_DSI_FMT_RGB565;
> +       dlpc->dsi->lanes = dlpc->dsi_lanes;
> +
> +       return devm_mipi_dsi_attach(dev, dlpc->dsi);
> +}
> +
> +static int dlpc3433_probe(struct i2c_client *client)
> +{
> +       struct device *dev = &client->dev;
> +       struct dlpc *dlpc;
> +       int ret;
> +
> +       dlpc = devm_kzalloc(dev, sizeof(*dlpc), GFP_KERNEL);
> +       if (!dlpc)
> +               return -ENOMEM;
> +
> +       dlpc->dev = dev;
> +
> +       dlpc->regmap = devm_regmap_init_i2c(client, &dlpc_regmap_config);
> +       if (IS_ERR(dlpc->regmap))
> +               return PTR_ERR(dlpc->regmap);
> +
> +       ret = dlpc3433_parse_dt(dlpc);
> +       if (ret)
> +               return ret;
> +
> +       dev_set_drvdata(dev, dlpc);
> +       i2c_set_clientdata(client, dlpc);
> +
> +       dlpc->bridge.funcs = &dlpc_bridge_funcs;
> +       dlpc->bridge.of_node = dev->of_node;
> +       drm_bridge_add(&dlpc->bridge);
> +
> +       ret = dlpc_host_attach(dlpc);
> +       if (ret) {
> +               DRM_DEV_ERROR(dev, "failed to attach dsi host\n");
> +               goto err_remove_bridge;
> +       }
> +
> +       return 0;
> +
> +err_remove_bridge:
> +       drm_bridge_remove(&dlpc->bridge);
> +       return ret;
> +}
> +
> +static int dlpc3433_remove(struct i2c_client *client)
> +{
> +       struct dlpc *dlpc = i2c_get_clientdata(client);
> +
> +       drm_bridge_remove(&dlpc->bridge);
> +       of_node_put(dlpc->host_node);
> +
> +       return 0;
> +}
> +
> +static const struct i2c_device_id dlpc3433_id[] = {
> +       { "ti,dlpc3433", 0 },
> +       { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(i2c, dlpc3433_id);
> +
> +static const struct of_device_id dlpc3433_match_table[] = {
> +       { .compatible = "ti,dlpc3433" },
> +       { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, dlpc3433_match_table);
> +
> +static struct i2c_driver dlpc3433_driver = {
> +       .probe_new = dlpc3433_probe,
> +       .remove = dlpc3433_remove,
> +       .id_table = dlpc3433_id,
> +       .driver = {
> +               .name = "ti-dlpc3433",
> +               .of_match_table = dlpc3433_match_table,
> +       },
> +};
> +module_i2c_driver(dlpc3433_driver);
> +
> +MODULE_AUTHOR("Jagan Teki <jagan@amarulasolutions.com>");
> +MODULE_AUTHOR("Christopher Vollo <chris@renewoutreach.org>");
> +MODULE_DESCRIPTION("TI DLPC3433 MIPI DSI Display Controller Bridge");
> +MODULE_LICENSE("GPL");
> --
> 2.25.1
>

Applied to drm-misc-next.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 2/2] drm: bridge: Add TI DLPC3433 DSI to DMD bridge
@ 2022-06-03 14:37     ` Robert Foss
  0 siblings, 0 replies; 8+ messages in thread
From: Robert Foss @ 2022-06-03 14:37 UTC (permalink / raw)
  To: Jagan Teki
  Cc: devicetree, Christopher Vollo, Neil Armstrong, linux-amarula,
	dri-devel, Rob Herring, Laurent Pinchart, Andrzej Hajda,
	Sam Ravnborg

On Fri, 3 Jun 2022 at 16:04, Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> TI DLPC3433 is a MIPI DSI based display controller bridge
> for processing high resolution DMD based projectors.
>
> It has a flexible configuration of MIPI DSI and DPI signal
> input that produces a DMD output in RGB565, RGB666, RGB888
> formats.
>
> It supports upto 720p resolution with 60 and 120 Hz refresh
> rates.
>
> Add bridge driver for it.
>
> Signed-off-by: Christopher Vollo <chris@renewoutreach.org>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v3:
> - none
> Changes for v2:
> - fixed license
> - filled display size buffer
> - fixed power off
> - fixed dev_err_probe
>
>  MAINTAINERS                          |   1 +
>  drivers/gpu/drm/bridge/Kconfig       |  16 +
>  drivers/gpu/drm/bridge/Makefile      |   1 +
>  drivers/gpu/drm/bridge/ti-dlpc3433.c | 417 +++++++++++++++++++++++++++
>  4 files changed, 435 insertions(+)
>  create mode 100644 drivers/gpu/drm/bridge/ti-dlpc3433.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index aea0fe5156af..ede21cc48708 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -6435,6 +6435,7 @@ DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
>  M:     Jagan Teki <jagan@amarulasolutions.com>
>  S:     Maintained
>  F:     Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
> +F:     drivers/gpu/drm/bridge/ti-dlpc3433.c
>
>  DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
>  R:     Douglas Anderson <dianders@chromium.org>
> diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
> index 146ab069838f..4b28f939fff6 100644
> --- a/drivers/gpu/drm/bridge/Kconfig
> +++ b/drivers/gpu/drm/bridge/Kconfig
> @@ -321,6 +321,22 @@ config DRM_TOSHIBA_TC358775
>         help
>           Toshiba TC358775 DSI/LVDS bridge chip driver.
>
> +config DRM_TI_DLPC3433
> +       tristate "TI DLPC3433 Display controller"
> +       depends on DRM && DRM_PANEL
> +       depends on OF
> +       select DRM_MIPI_DSI
> +       help
> +         TI DLPC3433 is a MIPI DSI based display controller bridge
> +         for processing high resolution DMD based projectors.
> +
> +         It has a flexible configuration of MIPI DSI and DPI signal
> +         input that produces a DMD output in RGB565, RGB666, RGB888
> +         formats.
> +
> +         It supports upto 720p resolution with 60 and 120 Hz refresh
> +         rates.
> +
>  config DRM_TI_TFP410
>         tristate "TI TFP410 DVI/HDMI bridge"
>         depends on OF
> diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
> index f6c0a95de549..043b499545e3 100644
> --- a/drivers/gpu/drm/bridge/Makefile
> +++ b/drivers/gpu/drm/bridge/Makefile
> @@ -26,6 +26,7 @@ obj-$(CONFIG_DRM_TOSHIBA_TC358767) += tc358767.o
>  obj-$(CONFIG_DRM_TOSHIBA_TC358768) += tc358768.o
>  obj-$(CONFIG_DRM_TOSHIBA_TC358775) += tc358775.o
>  obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
> +obj-$(CONFIG_DRM_TI_DLPC3433) += ti-dlpc3433.o
>  obj-$(CONFIG_DRM_TI_SN65DSI83) += ti-sn65dsi83.o
>  obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o
>  obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
> diff --git a/drivers/gpu/drm/bridge/ti-dlpc3433.c b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> new file mode 100644
> index 000000000000..06e519798ac5
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/ti-dlpc3433.c
> @@ -0,0 +1,417 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2021 RenewOutReach
> + * Copyright (C) 2021 Amarula Solutions(India)
> + *
> + * Author:
> + * Jagan Teki <jagan@amarulasolutions.com>
> + * Christopher Vollo <chris@renewoutreach.org>
> + */
> +
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_of.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_mipi_dsi.h>
> +
> +#include <linux/delay.h>
> +#include <linux/gpio/consumer.h>
> +#include <linux/i2c.h>
> +#include <linux/module.h>
> +#include <linux/regmap.h>
> +#include <linux/regulator/consumer.h>
> +
> +enum cmd_registers {
> +       WR_INPUT_SOURCE         = 0x05, /* Write Input Source Select */
> +       WR_EXT_SOURCE_FMT       = 0x07, /* Write External Video Source Format */
> +       WR_IMAGE_CROP           = 0x10, /* Write Image Crop */
> +       WR_DISPLAY_SIZE         = 0x12, /* Write Display Size */
> +       WR_IMAGE_FREEZE         = 0x1A, /* Write Image Freeze */
> +       WR_INPUT_IMAGE_SIZE     = 0x2E, /* Write External Input Image Size */
> +       WR_RGB_LED_EN           = 0x52, /* Write RGB LED Enable */
> +       WR_RGB_LED_CURRENT      = 0x54, /* Write RGB LED Current */
> +       WR_RGB_LED_MAX_CURRENT  = 0x5C, /* Write RGB LED Max Current */
> +       WR_DSI_HS_CLK           = 0xBD, /* Write DSI HS Clock */
> +       RD_DEVICE_ID            = 0xD4, /* Read Controller Device ID */
> +       WR_DSI_PORT_EN          = 0xD7, /* Write DSI Port Enable */
> +};
> +
> +enum input_source {
> +       INPUT_EXTERNAL_VIDEO    = 0,
> +       INPUT_TEST_PATTERN,
> +       INPUT_SPLASH_SCREEN,
> +};
> +
> +#define DEV_ID_MASK            GENMASK(3, 0)
> +#define IMAGE_FREESE_EN                BIT(0)
> +#define DSI_PORT_EN            0
> +#define EXT_SOURCE_FMT_DSI     0
> +#define RED_LED_EN             BIT(0)
> +#define GREEN_LED_EN           BIT(1)
> +#define BLUE_LED_EN            BIT(2)
> +#define LED_MASK               GENMASK(2, 0)
> +#define MAX_BYTE_SIZE          8
> +
> +struct dlpc {
> +       struct device           *dev;
> +       struct drm_bridge       bridge;
> +       struct drm_bridge       *next_bridge;
> +       struct device_node      *host_node;
> +       struct mipi_dsi_device  *dsi;
> +       struct drm_display_mode mode;
> +
> +       struct gpio_desc        *enable_gpio;
> +       struct regulator        *vcc_intf;
> +       struct regulator        *vcc_flsh;
> +       struct regmap           *regmap;
> +       unsigned int            dsi_lanes;
> +};
> +
> +static inline struct dlpc *bridge_to_dlpc(struct drm_bridge *bridge)
> +{
> +       return container_of(bridge, struct dlpc, bridge);
> +}
> +
> +static bool dlpc_writeable_noinc_reg(struct device *dev, unsigned int reg)
> +{
> +       switch (reg) {
> +       case WR_IMAGE_CROP:
> +       case WR_DISPLAY_SIZE:
> +       case WR_INPUT_IMAGE_SIZE:
> +       case WR_DSI_HS_CLK:
> +               return true;
> +       default:
> +               return false;
> +       }
> +}
> +
> +static const struct regmap_range dlpc_volatile_ranges[] = {
> +       { .range_min = 0x10, .range_max = 0xBF },
> +};
> +
> +static const struct regmap_access_table dlpc_volatile_table = {
> +       .yes_ranges = dlpc_volatile_ranges,
> +       .n_yes_ranges = ARRAY_SIZE(dlpc_volatile_ranges),
> +};
> +
> +static struct regmap_config dlpc_regmap_config = {
> +       .reg_bits               = 8,
> +       .val_bits               = 8,
> +       .max_register           = WR_DSI_PORT_EN,
> +       .writeable_noinc_reg    = dlpc_writeable_noinc_reg,
> +       .volatile_table         = &dlpc_volatile_table,
> +       .cache_type             = REGCACHE_RBTREE,
> +       .name                   = "dlpc3433",
> +};
> +
> +static void dlpc_atomic_enable(struct drm_bridge *bridge,
> +                              struct drm_bridge_state *old_bridge_state)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +       struct device *dev = dlpc->dev;
> +       struct drm_display_mode *mode = &dlpc->mode;
> +       struct regmap *regmap = dlpc->regmap;
> +       char buf[MAX_BYTE_SIZE];
> +       unsigned int devid;
> +
> +       regmap_read(regmap, RD_DEVICE_ID, &devid);
> +       devid &= DEV_ID_MASK;
> +
> +       DRM_DEV_DEBUG(dev, "DLPC3433 device id: 0x%02x\n", devid);
> +
> +       if (devid != 0x01) {
> +               DRM_DEV_ERROR(dev, "Unsupported DLPC device id: 0x%02x\n", devid);
> +               return;
> +       }
> +
> +       /* disable image freeze */
> +       regmap_write(regmap, WR_IMAGE_FREEZE, IMAGE_FREESE_EN);
> +
> +       /* enable DSI port */
> +       regmap_write(regmap, WR_DSI_PORT_EN, DSI_PORT_EN);
> +
> +       memset(buf, 0, MAX_BYTE_SIZE);
> +
> +       /* set image crop */
> +       buf[4] = mode->hdisplay & 0xff;
> +       buf[5] = (mode->hdisplay & 0xff00) >> 8;
> +       buf[6] = mode->vdisplay & 0xff;
> +       buf[7] = (mode->vdisplay & 0xff00) >> 8;
> +       regmap_noinc_write(regmap, WR_IMAGE_CROP, buf, MAX_BYTE_SIZE);
> +
> +       /* set display size */
> +       buf[4] = mode->hdisplay & 0xff;
> +       buf[5] = (mode->hdisplay & 0xff00) >> 8;
> +       buf[6] = mode->vdisplay & 0xff;
> +       buf[7] = (mode->vdisplay & 0xff00) >> 8;
> +       regmap_noinc_write(regmap, WR_DISPLAY_SIZE, buf, MAX_BYTE_SIZE);
> +
> +       /* set input image size */
> +       buf[0] = mode->hdisplay & 0xff;
> +       buf[1] = (mode->hdisplay & 0xff00) >> 8;
> +       buf[2] = mode->vdisplay & 0xff;
> +       buf[3] = (mode->vdisplay & 0xff00) >> 8;
> +       regmap_noinc_write(regmap, WR_INPUT_IMAGE_SIZE, buf, 4);
> +
> +       /* set external video port */
> +       regmap_write(regmap, WR_INPUT_SOURCE, INPUT_EXTERNAL_VIDEO);
> +
> +       /* set external video format select as DSI */
> +       regmap_write(regmap, WR_EXT_SOURCE_FMT, EXT_SOURCE_FMT_DSI);
> +
> +       /* disable image freeze */
> +       regmap_write(regmap, WR_IMAGE_FREEZE, 0x00);
> +
> +       /* enable RGB led */
> +       regmap_update_bits(regmap, WR_RGB_LED_EN, LED_MASK,
> +                          RED_LED_EN | GREEN_LED_EN | BLUE_LED_EN);
> +
> +       msleep(10);
> +}
> +
> +static void dlpc_atomic_pre_enable(struct drm_bridge *bridge,
> +                                  struct drm_bridge_state *old_bridge_state)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +       int ret;
> +
> +       gpiod_set_value(dlpc->enable_gpio, 1);
> +
> +       msleep(500);
> +
> +       ret = regulator_enable(dlpc->vcc_intf);
> +       if (ret)
> +               DRM_DEV_ERROR(dlpc->dev,
> +                             "failed to enable VCC_INTF regulator: %d\n", ret);
> +
> +       ret = regulator_enable(dlpc->vcc_flsh);
> +       if (ret)
> +               DRM_DEV_ERROR(dlpc->dev,
> +                             "failed to enable VCC_FLSH regulator: %d\n", ret);
> +
> +       msleep(10);
> +}
> +
> +static void dlpc_atomic_post_disable(struct drm_bridge *bridge,
> +                                    struct drm_bridge_state *old_bridge_state)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +
> +       regulator_disable(dlpc->vcc_flsh);
> +       regulator_disable(dlpc->vcc_intf);
> +
> +       msleep(10);
> +
> +       gpiod_set_value(dlpc->enable_gpio, 0);
> +
> +       msleep(500);
> +}
> +
> +#define MAX_INPUT_SEL_FORMATS  1
> +
> +static u32 *
> +dlpc_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
> +                              struct drm_bridge_state *bridge_state,
> +                              struct drm_crtc_state *crtc_state,
> +                              struct drm_connector_state *conn_state,
> +                              u32 output_fmt,
> +                              unsigned int *num_input_fmts)
> +{
> +       u32 *input_fmts;
> +
> +       *num_input_fmts = 0;
> +
> +       input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts),
> +                            GFP_KERNEL);
> +       if (!input_fmts)
> +               return NULL;
> +
> +       /* This is the DSI-end bus format */
> +       input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24;
> +       *num_input_fmts = 1;
> +
> +       return input_fmts;
> +}
> +
> +static void dlpc_mode_set(struct drm_bridge *bridge,
> +                         const struct drm_display_mode *mode,
> +                         const struct drm_display_mode *adjusted_mode)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +
> +       drm_mode_copy(&dlpc->mode, adjusted_mode);
> +}
> +
> +static int dlpc_attach(struct drm_bridge *bridge,
> +                      enum drm_bridge_attach_flags flags)
> +{
> +       struct dlpc *dlpc = bridge_to_dlpc(bridge);
> +
> +       return drm_bridge_attach(bridge->encoder, dlpc->next_bridge, bridge, flags);
> +}
> +
> +static const struct drm_bridge_funcs dlpc_bridge_funcs = {
> +       .atomic_duplicate_state         = drm_atomic_helper_bridge_duplicate_state,
> +       .atomic_destroy_state           = drm_atomic_helper_bridge_destroy_state,
> +       .atomic_get_input_bus_fmts      = dlpc_atomic_get_input_bus_fmts,
> +       .atomic_reset                   = drm_atomic_helper_bridge_reset,
> +       .atomic_pre_enable              = dlpc_atomic_pre_enable,
> +       .atomic_enable                  = dlpc_atomic_enable,
> +       .atomic_post_disable            = dlpc_atomic_post_disable,
> +       .mode_set                       = dlpc_mode_set,
> +       .attach                         = dlpc_attach,
> +};
> +
> +static int dlpc3433_parse_dt(struct dlpc *dlpc)
> +{
> +       struct device *dev = dlpc->dev;
> +       struct device_node *endpoint;
> +       int ret;
> +
> +       dlpc->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
> +       if (IS_ERR(dlpc->enable_gpio))
> +               return PTR_ERR(dlpc->enable_gpio);
> +
> +       dlpc->vcc_intf = devm_regulator_get(dlpc->dev, "vcc_intf");
> +       if (IS_ERR(dlpc->vcc_intf))
> +               return dev_err_probe(dev, PTR_ERR(dlpc->vcc_intf),
> +                                    "failed to get VCC_INTF supply\n");
> +
> +       dlpc->vcc_flsh = devm_regulator_get(dlpc->dev, "vcc_flsh");
> +       if (IS_ERR(dlpc->vcc_flsh))
> +               return dev_err_probe(dev, PTR_ERR(dlpc->vcc_flsh),
> +                                    "failed to get VCC_FLSH supply\n");
> +
> +       dlpc->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
> +       if (IS_ERR(dlpc->next_bridge))
> +               return PTR_ERR(dlpc->next_bridge);
> +
> +       endpoint = of_graph_get_endpoint_by_regs(dev->of_node, 0, 0);
> +       dlpc->dsi_lanes = of_property_count_u32_elems(endpoint, "data-lanes");
> +       if (dlpc->dsi_lanes < 0 || dlpc->dsi_lanes > 4) {
> +               ret = -EINVAL;
> +               goto err_put_endpoint;
> +       }
> +
> +       dlpc->host_node = of_graph_get_remote_port_parent(endpoint);
> +       if (!dlpc->host_node) {
> +               ret = -ENODEV;
> +               goto err_put_host;
> +       }
> +
> +       of_node_put(endpoint);
> +
> +       return 0;
> +
> +err_put_host:
> +       of_node_put(dlpc->host_node);
> +err_put_endpoint:
> +       of_node_put(endpoint);
> +       return ret;
> +}
> +
> +static int dlpc_host_attach(struct dlpc *dlpc)
> +{
> +       struct device *dev = dlpc->dev;
> +       struct mipi_dsi_host *host;
> +       struct mipi_dsi_device_info info = {
> +               .type = "dlpc3433",
> +               .channel = 0,
> +               .node = NULL,
> +       };
> +
> +       host = of_find_mipi_dsi_host_by_node(dlpc->host_node);
> +       if (!host) {
> +               DRM_DEV_ERROR(dev, "failed to find dsi host\n");
> +               return -EPROBE_DEFER;
> +       }
> +
> +       dlpc->dsi = mipi_dsi_device_register_full(host, &info);
> +       if (IS_ERR(dlpc->dsi)) {
> +               DRM_DEV_ERROR(dev, "failed to create dsi device\n");
> +               return PTR_ERR(dlpc->dsi);
> +       }
> +
> +       dlpc->dsi->mode_flags = MIPI_DSI_MODE_VIDEO_BURST;
> +       dlpc->dsi->format = MIPI_DSI_FMT_RGB565;
> +       dlpc->dsi->lanes = dlpc->dsi_lanes;
> +
> +       return devm_mipi_dsi_attach(dev, dlpc->dsi);
> +}
> +
> +static int dlpc3433_probe(struct i2c_client *client)
> +{
> +       struct device *dev = &client->dev;
> +       struct dlpc *dlpc;
> +       int ret;
> +
> +       dlpc = devm_kzalloc(dev, sizeof(*dlpc), GFP_KERNEL);
> +       if (!dlpc)
> +               return -ENOMEM;
> +
> +       dlpc->dev = dev;
> +
> +       dlpc->regmap = devm_regmap_init_i2c(client, &dlpc_regmap_config);
> +       if (IS_ERR(dlpc->regmap))
> +               return PTR_ERR(dlpc->regmap);
> +
> +       ret = dlpc3433_parse_dt(dlpc);
> +       if (ret)
> +               return ret;
> +
> +       dev_set_drvdata(dev, dlpc);
> +       i2c_set_clientdata(client, dlpc);
> +
> +       dlpc->bridge.funcs = &dlpc_bridge_funcs;
> +       dlpc->bridge.of_node = dev->of_node;
> +       drm_bridge_add(&dlpc->bridge);
> +
> +       ret = dlpc_host_attach(dlpc);
> +       if (ret) {
> +               DRM_DEV_ERROR(dev, "failed to attach dsi host\n");
> +               goto err_remove_bridge;
> +       }
> +
> +       return 0;
> +
> +err_remove_bridge:
> +       drm_bridge_remove(&dlpc->bridge);
> +       return ret;
> +}
> +
> +static int dlpc3433_remove(struct i2c_client *client)
> +{
> +       struct dlpc *dlpc = i2c_get_clientdata(client);
> +
> +       drm_bridge_remove(&dlpc->bridge);
> +       of_node_put(dlpc->host_node);
> +
> +       return 0;
> +}
> +
> +static const struct i2c_device_id dlpc3433_id[] = {
> +       { "ti,dlpc3433", 0 },
> +       { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(i2c, dlpc3433_id);
> +
> +static const struct of_device_id dlpc3433_match_table[] = {
> +       { .compatible = "ti,dlpc3433" },
> +       { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, dlpc3433_match_table);
> +
> +static struct i2c_driver dlpc3433_driver = {
> +       .probe_new = dlpc3433_probe,
> +       .remove = dlpc3433_remove,
> +       .id_table = dlpc3433_id,
> +       .driver = {
> +               .name = "ti-dlpc3433",
> +               .of_match_table = dlpc3433_match_table,
> +       },
> +};
> +module_i2c_driver(dlpc3433_driver);
> +
> +MODULE_AUTHOR("Jagan Teki <jagan@amarulasolutions.com>");
> +MODULE_AUTHOR("Christopher Vollo <chris@renewoutreach.org>");
> +MODULE_DESCRIPTION("TI DLPC3433 MIPI DSI Display Controller Bridge");
> +MODULE_LICENSE("GPL");
> --
> 2.25.1
>

Applied to drm-misc-next.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 2/2] drm: bridge: Add TI DLPC3433 DSI to DMD bridge
  2022-06-03 14:37     ` Robert Foss
@ 2022-06-13  6:54       ` Uwe Kleine-König
  -1 siblings, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2022-06-13  6:54 UTC (permalink / raw)
  To: Robert Foss
  Cc: Jagan Teki, Rob Herring, Andrzej Hajda, Neil Armstrong,
	Laurent Pinchart, Sam Ravnborg, dri-devel, devicetree,
	linux-amarula, Christopher Vollo

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

Hello,

On Fri, Jun 03, 2022 at 04:37:51PM +0200, Robert Foss wrote:
> On Fri, 3 Jun 2022 at 16:04, Jagan Teki <jagan@amarulasolutions.com> wrote:
> > +static int dlpc3433_remove(struct i2c_client *client)
> > +{
> > +       struct dlpc *dlpc = i2c_get_clientdata(client);
> > +
> > +       drm_bridge_remove(&dlpc->bridge);
> > +       of_node_put(dlpc->host_node);
> > +
> > +       return 0;
> > +}
> > + [...]
> > +static struct i2c_driver dlpc3433_driver = {
> > +       .probe_new = dlpc3433_probe,
> > +       .remove = dlpc3433_remove,
> > +       .id_table = dlpc3433_id,
> > +       .driver = {
> > +               .name = "ti-dlpc3433",
> > +               .of_match_table = dlpc3433_match_table,
> > +       },
> > +};
> > +module_i2c_driver(dlpc3433_driver);
> 
> Applied to drm-misc-next.

just a quick note that there is an easy conflict between this patch and
my effort to make i2c remove callbacks return void. I intend to post my
series on top of v5.20-rc1, so if this patch goes in before, everything
is fine.

See
https://lore.kernel.org/linux-i2c/20220609091018.q52fhowlsdbdkct5@pengutronix.de/
for some more details.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 2/2] drm: bridge: Add TI DLPC3433 DSI to DMD bridge
@ 2022-06-13  6:54       ` Uwe Kleine-König
  0 siblings, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2022-06-13  6:54 UTC (permalink / raw)
  To: Robert Foss
  Cc: devicetree, Christopher Vollo, Neil Armstrong, linux-amarula,
	dri-devel, Rob Herring, Laurent Pinchart, Andrzej Hajda,
	Sam Ravnborg, Jagan Teki

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

Hello,

On Fri, Jun 03, 2022 at 04:37:51PM +0200, Robert Foss wrote:
> On Fri, 3 Jun 2022 at 16:04, Jagan Teki <jagan@amarulasolutions.com> wrote:
> > +static int dlpc3433_remove(struct i2c_client *client)
> > +{
> > +       struct dlpc *dlpc = i2c_get_clientdata(client);
> > +
> > +       drm_bridge_remove(&dlpc->bridge);
> > +       of_node_put(dlpc->host_node);
> > +
> > +       return 0;
> > +}
> > + [...]
> > +static struct i2c_driver dlpc3433_driver = {
> > +       .probe_new = dlpc3433_probe,
> > +       .remove = dlpc3433_remove,
> > +       .id_table = dlpc3433_id,
> > +       .driver = {
> > +               .name = "ti-dlpc3433",
> > +               .of_match_table = dlpc3433_match_table,
> > +       },
> > +};
> > +module_i2c_driver(dlpc3433_driver);
> 
> Applied to drm-misc-next.

just a quick note that there is an easy conflict between this patch and
my effort to make i2c remove callbacks return void. I intend to post my
series on top of v5.20-rc1, so if this patch goes in before, everything
is fine.

See
https://lore.kernel.org/linux-i2c/20220609091018.q52fhowlsdbdkct5@pengutronix.de/
for some more details.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-06-13  6:55 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-03 14:03 [PATCH v3 1/2] dt-bindings: display: bridge: Add TI DLPC3433 DSI to DMD Jagan Teki
2022-06-03 14:03 ` Jagan Teki
2022-06-03 14:03 ` [PATCH v3 2/2] drm: bridge: Add TI DLPC3433 DSI to DMD bridge Jagan Teki
2022-06-03 14:03   ` Jagan Teki
2022-06-03 14:37   ` Robert Foss
2022-06-03 14:37     ` Robert Foss
2022-06-13  6:54     ` Uwe Kleine-König
2022-06-13  6:54       ` Uwe Kleine-König

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.