MIPS: JZ4780 and CI20 HDMI

From: Paul Boddie <[email protected]>

Add support for the LCD controller present on JZ4780 SoCs. This SoC uses 8-byte descriptors which extend the current 4-byte descriptors used for other Ingenic SoCs.

Note that plane f0 is not working and disabled to be seen from user-space.

Tested on MIPS Creator CI20 board.

Signed-off-by Paul Boddie <[email protected]>

Signed-off-by Ezequiel Garcia <[email protected]>

Signed-off-by H. Nikolaus Schaller <[email protected]>

---
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

drivers/gpu/drm/ingenic/ingenic-drm-drv.c +3 -1

index 7f10d6eed549d..dcf44cb00821f 100644
@@ -65,8 +65,10 @@ struct ingenic_dma_hwdescs {
 struct jz_soc_info {
 	bool needs_dev_clk;
 	bool has_osd;
+	bool has_alpha;
 	bool map_noncoherent;
 	bool use_extended_hwdesc;
+	bool plane_f0_not_working;
 	unsigned int max_width, max_height;
 	const u32 *formats_f0, *formats_f1;
 	unsigned int num_formats_f0, num_formats_f1;

@@ -453,7 +455,7 @@ static int ingenic_drm_plane_atomic_check(struct 
 drm_plane *plane,
 	if (!crtc)
 		return 0;
 
-	if (plane == &priv->f0)
+	if (priv->soc_info->plane_f0_not_working && plane == &priv->f0)
 		return -EINVAL;
 

drivers/gpu/drm/ingenic/ingenic-drm-drv.c +1 -0

 	crtc_state = drm_atomic_get_existing_crtc_state(state,

@@ -1055,6 +1057,7 @@ static int ingenic_drm_bind(struct device *dev, 
 bool has_components)
 	long parent_rate;
 	unsigned int i, clone_mask = 0;
 	int ret, irq;
+	u32 osdc = 0;
 
 	soc_info = of_device_get_match_data(dev);

drivers/gpu/drm/ingenic/ingenic-drm-drv.c +4 -1

 	if (!soc_info) {

@@ -1312,7 +1315,10 @@ static int ingenic_drm_bind(struct device 
 *dev, bool has_components)
 
 	/* Enable OSD if available */
 	if (soc_info->has_osd)
-		regmap_write(priv->map, JZ_REG_LCD_OSDC, JZ_LCD_OSDC_OSDEN);
+		osdc |= JZ_LCD_OSDC_OSDEN;
+	if (soc_info->has_alpha)
+		osdc |= JZ_LCD_OSDC_ALPHAEN;
+	regmap_write(priv->map, JZ_REG_LCD_OSDC, osdc);
 
 	mutex_init(&priv->clk_mutex);

drivers/gpu/drm/ingenic/ingenic-drm-drv.c +2 -0

 	priv->clock_nb.notifier_call = ingenic_drm_update_pixclk;

@@ -1511,7 +1517,9 @@ static const struct jz_soc_info jz4770_soc_info 
 = {
 static const struct jz_soc_info jz4780_soc_info = {
 	.needs_dev_clk = true,
 	.has_osd = true,
+	.has_alpha = true,
 	.use_extended_hwdesc = true,
+	.plane_f0_not_working = true,	/* REVISIT */
 	.max_width = 4096,
 	.max_height = 2048,

.formats_f1 = jz4770_formats_f1,
--
2.33.0

Am 12.02.2022 um 15:44 schrieb Paul Cercueil <[email protected]>:

Hi Nikolaus,

Quoted 7 lines · H. Nikolaus Schaller

From: Paul Boddie <[email protected]>
Add support for the LCD controller present on JZ4780 SoCs. This SoC uses 8-byte descriptors which extend the current 4-byte descriptors used for other Ingenic SoCs. Note that plane f0 is not working and disabled to be seen from user-space.
Tested on MIPS Creator CI20 board.

That's not really what the patch does though. It's a fix for a commit that has the exact same title and description, and is already merged: b807fd2c43fe ("drm/ingenic: Add support for JZ4780 and HDMI output").

Please rewrite the patch's title and description to actually describe its purpose.

Cheers,
-Paul

Quoted 57 lines

Signed-off-by Paul Boddie <[email protected]>

Signed-off-by Ezequiel Garcia <[email protected]>

Signed-off-by H. Nikolaus Schaller <[email protected]>

---
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 12 ++++++++++--

1 file changed, 10 insertions(+), 2 deletions(-)

drivers/gpu/drm/ingenic/ingenic-drm-drv.c +10 -3

index 7f10d6eed549d..dcf44cb00821f 100644
@@ -65,8 +65,10 @@ struct ingenic_dma_hwdescs {
 struct jz_soc_info {
 	bool needs_dev_clk;
 	bool has_osd;
+	bool has_alpha;
 	bool map_noncoherent;
 	bool use_extended_hwdesc;
+	bool plane_f0_not_working;
 	unsigned int max_width, max_height;
 	const u32 *formats_f0, *formats_f1;
 	unsigned int num_formats_f0, num_formats_f1;

@@ -453,7 +455,7 @@ static int ingenic_drm_plane_atomic_check(struct drm_plane *plane,
 	if (!crtc)
 		return 0;
-	if (plane == &priv->f0)
+	if (priv->soc_info->plane_f0_not_working && plane == &priv->f0)
 		return -EINVAL;
 	crtc_state = drm_atomic_get_existing_crtc_state(state,

@@ -1055,6 +1057,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components)
 	long parent_rate;
 	unsigned int i, clone_mask = 0;
 	int ret, irq;
+	u32 osdc = 0;
 	soc_info = of_device_get_match_data(dev);
 	if (!soc_info) {

@@ -1312,7 +1315,10 @@ static int ingenic_drm_bind(struct device *dev, bool has_components)
 	/* Enable OSD if available */
 	if (soc_info->has_osd)
-		regmap_write(priv->map, JZ_REG_LCD_OSDC, JZ_LCD_OSDC_OSDEN);
+		osdc |= JZ_LCD_OSDC_OSDEN;
+	if (soc_info->has_alpha)
+		osdc |= JZ_LCD_OSDC_ALPHAEN;
+	regmap_write(priv->map, JZ_REG_LCD_OSDC, osdc);
 	mutex_init(&priv->clk_mutex);
 	priv->clock_nb.notifier_call = ingenic_drm_update_pixclk;

@@ -1511,7 +1517,9 @@ static const struct jz_soc_info jz4770_soc_info = {
 static const struct jz_soc_info jz4780_soc_info = {
 	.needs_dev_clk = true,
 	.has_osd = true,
+	.has_alpha = true,
 	.use_extended_hwdesc = true,
+	.plane_f0_not_working = true,	/* REVISIT */
 	.max_width = 4096,
 	.max_height = 2048,
 	.formats_f1 = jz4770_formats_f1,
--

2.33.0

From: Sam Ravnborg <[email protected]>

Add DT bindings for the hdmi driver for the Ingenic JZ4780 SoC. Based on .txt binding from Zubair Lutfullah Kakakhel

Signed-off-by Sam Ravnborg <[email protected]>

Signed-off-by H. Nikolaus Schaller <[email protected]>

Cc Rob Herring <[email protected]>

Cc [email protected]

Reviewed-by Rob Herring <[email protected]>

---
 .../display/bridge/ingenic,jz4780-hdmi.yaml   | 82 
+++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 

Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml

(quoted diff) +0 -0

new file mode 100644
index 0000000000000..b8219eab4475a

b/Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml

Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +4 -0

@@ -0,0 +1,82 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: 

http://devicetree.org/schemas/display/bridge/ingenic,jz4780-hdmi.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#

Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +8 -0

+
+title: Bindings for Ingenic JZ4780 HDMI Transmitter
+
+maintainers:
+  - H. Nikolaus Schaller <[email protected]>
+
+description: |
+  The HDMI Transmitter in the Ingenic JZ4780 is a Synopsys 

DesignWare HDMI 1.4

Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml new file +69 -1

+  TX controller IP with accompanying PHY IP.
+
+allOf:
+  - $ref: synopsys,dw-hdmi.yaml#
+
+properties:
+  compatible:
+    const: ingenic,jz4780-dw-hdmi
+
+  reg-io-width:
+    const: 4
+
+  clocks:
+    maxItems: 2
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+
+    properties:
+      port@0:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: Input from LCD controller output.
+
+      port@1:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: Link to the HDMI connector.
+
+required:
+  - compatible
+  - clocks
+  - clock-names
+  - ports
+  - reg-io-width
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/ingenic,jz4780-cgu.h>
+
+    hdmi: hdmi@10180000 {
+        compatible = "ingenic,jz4780-dw-hdmi";
+        reg = <0x10180000 0x8000>;
+        reg-io-width = <4>;
+        ddc-i2c-bus = <&i2c4>;
+        interrupt-parent = <&intc>;
+        interrupts = <3>;
+        clocks = <&cgu JZ4780_CLK_AHB0>, <&cgu JZ4780_CLK_HDMI>;
+        clock-names = "iahb", "isfr";
+
+        ports {
+            #address-cells = <1>;
+            #size-cells = <0>;
+            hdmi_in: port@0 {
+                reg = <0>;
+                dw_hdmi_in: endpoint {
+                    remote-endpoint = <&jz4780_lcd_out>;
+                };
+            };
+            hdmi_out: port@1 {
+                reg = <1>;
+                dw_hdmi_out: endpoint {
+                    remote-endpoint = <&hdmi_con>;
+                };
+            };
+        };
+    };
+
+...
--

2.33.0

Commit 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks")

introduced a new mechanism to negotiate bus formats between hdmi connector and the synopsys hdmi driver inside the jz4780.

By this, the dw-hdmi is no longer the only bridge and sets up a list of formats in dw_hdmi_bridge_atomic_get_output_bus_fmts().

This includes MEDIA_BUS_FMT_UYVY8_1X16 which is chosen for the jz4780 but only produces a black screen.

This fix is based on the observation that max_bpc = 0 when running this function while info->bpc = 8. Since the formats checks before this always test for max_bpc >= info->pbc indirectly my assumption is that we must check it here as well.

Adding the proposed patch makes the CI20/jz4780 panel work again in MEDIA_BUS_FMT_RGB888_1X24 mode.

Fixes 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks")

Signed-off-by H. Nikolaus Schaller <[email protected]>

---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +2 -2

index b0d8110dd412c..826a055a7a273 100644
@@ -2620,10 +2620,10 @@ static u32 
 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
 		output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
 	}
 
-	if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+	if (max_bpc >= info->bpc && info->color_formats & 
 DRM_COLOR_FORMAT_YCBCR422)
 		output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
 
-	if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+	if (max_bpc >= info->bpc && info->color_formats & 
 DRM_COLOR_FORMAT_YCBCR444)

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +0 -1

 		output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
 
 	/* Default 8bit RGB fallback */
--

2.33.0

Am 12.02.2022 um 16:06 schrieb Paul Cercueil <[email protected]>:

Hi Nikolaus,

Quoted 7 lines · H. Nikolaus Schaller

Commit 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks") introduced a new mechanism to negotiate bus formats between hdmi connector and the synopsys hdmi driver inside the jz4780.
By this, the dw-hdmi is no longer the only bridge and sets up a list
of formats in dw_hdmi_bridge_atomic_get_output_bus_fmts().
This includes MEDIA_BUS_FMT_UYVY8_1X16 which is chosen for the jz4780 but only produces a black screen.

Neil pushed a fix yesterday that looks like it could fix your issue.
The fix is: 1528038385c0 ("drm/bridge: dw-hdmi: use safe format when first in bridge chain")

Could you try if it does indeed fix your issue?

Cheers,
-Paul

Quoted 27 lines

This fix is based on the observation that max_bpc = 0 when running this function while info->bpc = 8. Since the formats checks before this always test for max_bpc >= info->pbc indirectly my assumption is that we must check it here as well.
Adding the proposed patch makes the CI20/jz4780 panel work again in MEDIA_BUS_FMT_RGB888_1X24 mode.

Fixes 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks")

Signed-off-by H. Nikolaus Schaller <[email protected]>

---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +2 -3

index b0d8110dd412c..826a055a7a273 100644
@@ -2620,10 +2620,10 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
 		output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
 	}
-	if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+	if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
 		output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
-	if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+	if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
 		output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
 	/* Default 8bit RGB fallback */
--

2.33.0

Originally we proposed a new hdmi-5v-supply regulator reference for CI20 device tree but that was superseded by a better idea to use the already defined "ddc-en-gpios" property of the "hdmi-connector".

Since "MIPS: DTS: CI20: Add DT nodes for HDMI setup" has already been applied to v5.17-rc1, we add this on top.

Fixes ae1b8d2c2de9 ("MIPS: DTS: CI20: Add DT nodes for HDMI setup")

Signed-off-by H. Nikolaus Schaller <[email protected]>

Reviewed-by Paul Cercueil <[email protected]>

---
 arch/mips/boot/dts/ingenic/ci20.dts | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

arch/mips/boot/dts/ingenic/ci20.dts +2 -14

index 3e336b3dbb109..ab6e3dc0bc1d0 100644
@@ -83,6 +83,8 @@ hdmi_out: connector {
 		label = "HDMI OUT";
 		type = "a";
 
+		ddc-en-gpios = <&gpa 25 GPIO_ACTIVE_HIGH>;
+
 		port {
 			hdmi_con: endpoint {
 				remote-endpoint = <&dw_hdmi_out>;

@@ -114,17 +116,6 @@ otg_power: fixedregulator@2 {
 		gpio = <&gpf 14 GPIO_ACTIVE_LOW>;
 		enable-active-high;
 	};
-
-	hdmi_power: fixedregulator@3 {
-		compatible = "regulator-fixed";
-
-		regulator-name = "hdmi_power";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-
-		gpio = <&gpa 25 0>;
-		enable-active-high;
-	};
 };
 
 &ext {

@@ -576,8 +567,6 @@ &hdmi {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pins_hdmi_ddc>;
 
-	hdmi-5v-supply = <&hdmi_power>;
-
 	ports {
 		#address-cells = <1>;
 		#size-cells = <0>;
--

2.33.0

Am 12.02.2022 um 15:58 schrieb Paul Cercueil <[email protected]>:

Hi,

Quoted 8 lines · H. Nikolaus Schaller

Originally we proposed a new hdmi-5v-supply regulator reference for CI20 device tree but that was superseded by a better idea to use the already defined "ddc-en-gpios" property of the "hdmi-connector". Since "MIPS: DTS: CI20: Add DT nodes for HDMI setup" has already been applied to v5.17-rc1, we add this on top.

Fixes ae1b8d2c2de9 ("MIPS: DTS: CI20: Add DT nodes for HDMI setup")

Signed-off-by H. Nikolaus Schaller <[email protected]>

Reviewed-by Paul Cercueil <[email protected]>

Since it's already applied you don't have to send this patch anymore.

Cheers,
-Paul

Quoted 42 lines

---
arch/mips/boot/dts/ingenic/ci20.dts | 15 ++-------------

1 file changed, 2 insertions(+), 13 deletions(-)

arch/mips/boot/dts/ingenic/ci20.dts +2 -14

index 3e336b3dbb109..ab6e3dc0bc1d0 100644
@@ -83,6 +83,8 @@ hdmi_out: connector {
 		label = "HDMI OUT";
 		type = "a";
+		ddc-en-gpios = <&gpa 25 GPIO_ACTIVE_HIGH>;
+
 		port {
 			hdmi_con: endpoint {
 				remote-endpoint = <&dw_hdmi_out>;

@@ -114,17 +116,6 @@ otg_power: fixedregulator@2 {
 		gpio = <&gpf 14 GPIO_ACTIVE_LOW>;
 		enable-active-high;
 	};
-
-	hdmi_power: fixedregulator@3 {
-		compatible = "regulator-fixed";
-
-		regulator-name = "hdmi_power";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-
-		gpio = <&gpa 25 0>;
-		enable-active-high;
-	};
 };
 &ext {

@@ -576,8 +567,6 @@ &hdmi {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pins_hdmi_ddc>;
-	hdmi-5v-supply = <&hdmi_power>;
-
 	ports {
 		#address-cells = <1>;
 		#size-cells = <0>;
--

2.33.0