Skip to contentSkip to conversation

rockchip: rk3399: Fix HDMI out

PATCH New Jagan Teki 5 participants 11 messages Jan 23, 2020 – Mar 2, 2020 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

cover rockchip: rk3399: Fix HDMI out

Due to recent Linux dts(i) sync for rk3399. the existing vop driver is not working with HDMI out on RK3399.

These patches fixing the same and enabled HDMI out new boards.

Any inputs?
Jagan.

Jagan Teki (4):
arm64: dts: rk3399-u-boot: Delete vop assigned-clocks/rates
video: rockchip: Fix vop modes for rk3399
rockchip: Enable pre console for rk3399
rockchip: Enable HDMI output on rk3399 board w/ HDMI

 arch/arm/dts/rk3399-u-boot.dtsi                 |  4 ++++
 arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
 arch/arm/mach-rockchip/Kconfig                  |  1 +
 common/Kconfig                                  |  1 +
 configs/nanopc-t4-rk3399_defconfig              |  6 ++++++
 configs/nanopi-m4-rk3399_defconfig              |  6 ++++++
 configs/nanopi-neo4-rk3399_defconfig            |  6 ++++++
 configs/roc-pc-rk3399_defconfig                 |  6 ++++++
 drivers/video/rockchip/rk3399_vop.c             |  2 --
 drivers/video/rockchip/rk_vop.c                 |  4 ++++
 include/configs/evb_rk3399.h                    |  5 +++++
 11 files changed, 50 insertions(+), 2 deletions(-)
Signature · 1 line
2.18.0.321.gffc6fa0e3

A message that is not in the archive (sent off-list or not yet received): 20200123162845.10651-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

#2 lore raw

PATCH 1/4 arm64: dts: rk3399-u-boot: Delete vop assigned-clocks/rates

Linux supporting assigned-clocks for VOP on rk3399 by assuming U-Boot not initializing it on this linux commit:

commit <617f4472bdd3> ("arm64: dts: rockchip: init rk3399 vop clock rates")

There is no specific need to initialize these assigned clock in U-Boot as video drivers still work with default aclk and hclk values. So, these clocks are simply not supported by rk3399 clock driver.

But, during stdio probe of vidconsole, the device probe will try to check whether the assigned clocks on that video console node is initialized or not? and return error if not.

So, delete these property via -u-boot dtsi as there is no specific need in U-Boot.

---
 arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/dts/rk3399-u-boot.dtsi +4 -0
index 40240bbfc2..b8b20ed22d 100644
@@ -64,9 +64,13 @@
 };
 
 &vopb {
+	/delete-property/ assigned-clocks;
+	/delete-property/ assigned-clock-rates;
 	u-boot,dm-pre-reloc;
 };
 
 &vopl {
+	/delete-property/ assigned-clocks;
+	/delete-property/ assigned-clock-rates;
 	u-boot,dm-pre-reloc;
 };
Signature · 7 lines
2.18.0.321.gffc6fa0e3


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#3 lore raw

PATCH 2/4 video: rockchip: Fix vop modes for rk3399

In reply to a message not in the archive

VOP display endpoint pipeline configuration is differs between rk3288 vs rk3399.

These VOP pipeline configuration depends on how the different display interfaces connected in sequence to IN and OUT ports like for,

RK3288:

vopb_out: port {
	#address-cells = <1>;
	#size-cells = <0>;
	vopb_out_edp: endpoint@0 {
		reg = <0>;
		remote-endpoint = <&edp_in_vopb>;
	};
	vopb_out_hdmi: endpoint@1 {
		reg = <1>;
                remote-endpoint = <&hdmi_in_vopb>;
        };
        vopb_out_lvds: endpoint@2 {
                reg = <2>;
                remote-endpoint = <&lvds_in_vopb>;
        };
        vopb_out_mipi: endpoint@3 {
                reg = <3>;
                remote-endpoint = <&mipi_in_vopb>;
        };
};

RK3399:

vopb_out: port {
         #address-cells = <1>;
         #size-cells = <0>;
         vopb_out_edp: endpoint@0 {
                reg = <0>;
                remote-endpoint = <&edp_in_vopb>;
         };
         vopb_out_mipi: endpoint@1 {
                reg = <1>;
                remote-endpoint = <&mipi_in_vopb>;
         };
         vopb_out_hdmi: endpoint@2 {
                reg = <2>;
                remote-endpoint = <&hdmi_in_vopb>;
         };
         vopb_out_mipi1: endpoint@3 {
                reg = <3>;
                remote-endpoint = <&mipi1_in_vopb>;
         };
         vopb_out_dp: endpoint@4 {
                reg = <4>;
                remote-endpoint = <&dp_in_vopb>;
         };
};

here, HDMI interface has endpoint 1 in rk3288 and 2 in rk3399.

The rockchip vop driver often depends on this determined endpoint number and stored in vop_mode. So based on this vop_mode the bpp and pin polarity would configure on detected display interface.

Since, the existing driver using rk3288 vop mode settings enabling the same will result wrong display interface configuration for rk3399.

Add the patch for fixing these vop modes for rk3399.

---
 arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++
 drivers/video/rockchip/rk3399_vop.c             |  2 --
 drivers/video/rockchip/rk_vop.c                 |  4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)
arch/arm/include/asm/arch-rockchip/vop_rk3288.h +11 -0
index 8398249509..872a158b71 100644
@@ -85,6 +85,16 @@ enum {
 	LB_RGB_1280X8 = 0x5
 };
 
+#if defined(CONFIG_ROCKCHIP_RK3399)
+enum vop_modes {
+	VOP_MODE_EDP = 0,
+	VOP_MODE_MIPI,
+	VOP_MODE_HDMI,
+	VOP_MODE_MIPI1,
+	VOP_MODE_DP,
+	VOP_MODE_NONE,
+};
+#else
 enum vop_modes {
 	VOP_MODE_EDP = 0,
 	VOP_MODE_HDMI,
@@ -94,6 +104,7 @@ enum vop_modes {
 	VOP_MODE_AUTO_DETECT,
 	VOP_MODE_UNKNOWN,
 };
+#endif
 
 /* VOP_VERSION_INFO */
 #define M_FPGA_VERSION (0xffff << 16)
drivers/video/rockchip/rk3399_vop.c +0 -2
index 81c122d7a9..1d5b3931a6 100644
@@ -45,8 +45,6 @@ static void rk3399_set_pin_polarity(struct udevice *dev,
 				V_RK3399_DSP_MIPI_POL(polarity));
 		break;
 
-	case VOP_MODE_LVDS:
-		/* The RK3399 has neither parallel RGB nor LVDS output. */
 	default:
 		debug("%s: unsupported output mode %x\n", __func__, mode);
 	}
drivers/video/rockchip/rk_vop.c +4 -0
index b56c3f336c..bdb790a0c5 100644
@@ -117,10 +117,12 @@ static void rkvop_enable_output(struct udevice *dev, enum vop_modes mode)
 				V_EDP_OUT_EN(1));
 		break;
 
+#if defined(CONFIG_ROCKCHIP_RK3288)
 	case VOP_MODE_LVDS:
 		clrsetbits_le32(&regs->sys_ctrl, M_ALL_OUT_EN,
 				V_RGB_OUT_EN(1));
 		break;
+#endif
 
 	case VOP_MODE_MIPI:
 		clrsetbits_le32(&regs->sys_ctrl, M_ALL_OUT_EN,
@@ -312,7 +314,9 @@ static int rk_display_init(struct udevice *dev, ulong fbbase, ofnode ep_node)
 	/* Set bitwidth for vop display according to vop mode */
 	switch (vop_id) {
 	case VOP_MODE_EDP:
+#if defined(CONFIG_ROCKCHIP_RK3288)
 	case VOP_MODE_LVDS:
+#endif
 		l2bpp = VIDEO_BPP16;
 		break;
 	case VOP_MODE_HDMI:
Signature · 1 line
2.18.0.321.gffc6fa0e3
#4 lore raw

PATCH 3/4 rockchip: Enable pre console for rk3399

In reply to a message not in the archive

Enable pre console buffer for rk3399 platform.

This would help to capture the console messages prior to the console being initialised. Enabling this would help to capture all the console messages on video output source like HDMI. So we can find the full console messages of U-Boot proper on HDMI display when enabled it for RK3399 platform boards.

Buffer address used for pre console is 0x0f200000 which is ram base plus 240MiB. right now the Allwinner SoC is using similar computation.

---
 arch/arm/mach-rockchip/Kconfig | 1 +
 common/Kconfig                 | 1 +
 2 files changed, 2 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index ed7514ab75..0cb1f23d0f 100644
@@ -229,6 +229,7 @@ config ROCKCHIP_RK3399
 	select DM_PMIC
 	select DM_REGULATOR_FIXED
 	select BOARD_LATE_INIT
+	imply PRE_CONSOLE_BUFFER
 	imply ROCKCHIP_COMMON_BOARD
 	imply ROCKCHIP_SDRAM_COMMON
 	imply SPL_ROCKCHIP_COMMON_BOARD
common/Kconfig +1 -0
index 21d0244050..7d81924340 100644
@@ -568,6 +568,7 @@ config PRE_CON_BUF_ADDR
 	default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
 	default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
 	default 0x0f000000 if ROCKCHIP_RK3288
+	default 0x0f200000 if ROCKCHIP_RK3399
 	help
 	  This sets the start address of the pre-console buffer. This must
 	  be in available memory and is accessed before relocation and
Signature · 1 line
2.18.0.321.gffc6fa0e3
#5 lore raw

PATCH 4/4 rockchip: Enable HDMI output on rk3399 board w/ HDMI

In reply to a message not in the archive

Enable config options and console setting to respective rk3399 board for HDMI output.

Boards supported and tested on this patch are:
- NanoPc T4
- NanoPi M4
- NanoPi Neo4
- ROC-RK3399-PC

---
 configs/nanopc-t4-rk3399_defconfig   | 6 ++++++
 configs/nanopi-m4-rk3399_defconfig   | 6 ++++++
 configs/nanopi-neo4-rk3399_defconfig | 6 ++++++
 configs/roc-pc-rk3399_defconfig      | 6 ++++++
 include/configs/evb_rk3399.h         | 5 +++++
 5 files changed, 29 insertions(+)
configs/nanopc-t4-rk3399_defconfig +6 -0
index bd6d60ff6c..17e8a18d31 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/nanopi-m4-rk3399_defconfig +6 -0
index 74ede13c23..b73b2fdc27 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/nanopi-neo4-rk3399_defconfig +6 -0
index a44124aac0..2ecb50967b 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/roc-pc-rk3399_defconfig +6 -0
index 3a051d9b0c..a9f99f992d 100644
@@ -56,3 +56,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
include/configs/evb_rk3399.h +5 -0
index c0b0358893..09eb361655 100644
@@ -6,6 +6,11 @@
 #ifndef __EVB_RK3399_H
 #define __EVB_RK3399_H
 
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,cros-ec-keyb\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
 #include <configs/rk3399_common.h>
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
Signature · 1 line
2.18.0.321.gffc6fa0e3
#6 lore raw

Re: [PATCH 4/4] rockchip: Enable HDMI output on rk3399 board w/ HDMI

Quoted 80 lines · Jagan Teki

Enable config options and console setting to respective rk3399 board for HDMI output.

Boards supported and tested on this patch are:
- NanoPc T4
- NanoPi M4
- NanoPi Neo4
- ROC-RK3399-PC

---
 configs/nanopc-t4-rk3399_defconfig   | 6 ++++++
 configs/nanopi-m4-rk3399_defconfig   | 6 ++++++
 configs/nanopi-neo4-rk3399_defconfig | 6 ++++++
 configs/roc-pc-rk3399_defconfig      | 6 ++++++
 include/configs/evb_rk3399.h         | 5 +++++
 5 files changed, 29 insertions(+)
configs/nanopc-t4-rk3399_defconfig +6 -0
index bd6d60ff6c..17e8a18d31 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/nanopi-m4-rk3399_defconfig +6 -0
index 74ede13c23..b73b2fdc27 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/nanopi-neo4-rk3399_defconfig +6 -0
index a44124aac0..2ecb50967b 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/roc-pc-rk3399_defconfig +6 -0
index 3a051d9b0c..a9f99f992d 100644
@@ -56,3 +56,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
include/configs/evb_rk3399.h +0 -0
index c0b0358893..09eb361655 100644
@@ -6,6 +6,11 @@
 #ifndef __EVB_RK3399_H

include/configs/evb_rk3399.h line 16

Quoted 10 lines
include/configs/evb_rk3399.h +5 -0
 #define __EVB_RK3399_H
 
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdin=serial,cros-ec-keyb\0" \
+		"stdout=serial,vidconsole\0" \
+		"stderr=serial,vidconsole\0"
+
 #include <configs/rk3399_common.h>
 
 #if defined(CONFIG_ENV_IS_IN_MMC)

This seems like another commit (along with the question I saw about i.MX FB not showing the right colors) 2cc393f32fd9 needs to be reworked so that we default to enabling everything still but let boards opt out rather than forcing everyone to opt-in as it seems like there's a lot of cases where people need to opt-in and didn't know.

Signature · 1 line
Tom
#7 lore raw

Re: [PATCH 4/4] rockchip: Enable HDMI output on rk3399 board w/ HDMI

Quoted 5 lines · On Fri, 24 Jan 2020 10:27:35 -0500 Tom Rini [email protected] wrote:

This seems like another commit (along with the question I saw about i.MX FB not showing the right colors) 2cc393f32fd9 needs to be reworked so that we default to enabling everything still but let boards opt out rather than forcing everyone to opt-in as it seems like there's a lot of cases where people need to opt-in and didn't know.

yes, I'll rework this.

--
Anatolij

author
#8 lore raw

Re: [PATCH 4/4] rockchip: Enable HDMI output on rk3399 board w/ HDMI

In reply to Tom Rini
Quoted 92 lines · Tom Rini
Quoted 89 lines · Jagan Teki

Enable config options and console setting to respective rk3399 board for HDMI output.

Boards supported and tested on this patch are:
- NanoPc T4
- NanoPi M4
- NanoPi Neo4
- ROC-RK3399-PC

---
 configs/nanopc-t4-rk3399_defconfig   | 6 ++++++
 configs/nanopi-m4-rk3399_defconfig   | 6 ++++++
 configs/nanopi-neo4-rk3399_defconfig | 6 ++++++
 configs/roc-pc-rk3399_defconfig      | 6 ++++++
 include/configs/evb_rk3399.h         | 5 +++++
 5 files changed, 29 insertions(+)
configs/nanopc-t4-rk3399_defconfig +6 -0
index bd6d60ff6c..17e8a18d31 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/nanopi-m4-rk3399_defconfig +6 -0
index 74ede13c23..b73b2fdc27 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/nanopi-neo4-rk3399_defconfig +6 -0
index a44124aac0..2ecb50967b 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/roc-pc-rk3399_defconfig +6 -0
index 3a051d9b0c..a9f99f992d 100644
@@ -56,3 +56,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
include/configs/evb_rk3399.h +5 -0
index c0b0358893..09eb361655 100644
@@ -6,6 +6,11 @@
 #ifndef __EVB_RK3399_H
 #define __EVB_RK3399_H
 
+#define ROCKCHIP_DEVICE_SETTINGS \
+             "stdin=serial,cros-ec-keyb\0" \
+             "stdout=serial,vidconsole\0" \
+             "stderr=serial,vidconsole\0"
+
 #include <configs/rk3399_common.h>
 
Quoted 7 lines

include/configs/evb_rk3399.h line 16

Quoted 1 line
include/configs/evb_rk3399.h +0 -0
 #if defined(CONFIG_ENV_IS_IN_MMC)

This seems like another commit (along with the question I saw about i.MX FB not showing the right colors) 2cc393f32fd9 needs to be reworked so that we default to enabling everything still but let boards opt out rather than forcing everyone to opt-in as it seems like there's a lot of cases where people need to opt-in and didn't know.

yes, this evb board config is common across most of the rk3399 defconfig boards. this patch enable hdmi on few rk3399 boards all use same config file, evb_rk3399.h

#9 lore raw

Re: [PATCH 4/4] rockchip: Enable HDMI output on rk3399 board w/ HDMI

Quoted 101 lines · Jagan Teki
Quoted 92 lines · Tom Rini
Quoted 89 lines · Jagan Teki

Enable config options and console setting to respective rk3399 board for HDMI output.

Boards supported and tested on this patch are:
- NanoPc T4
- NanoPi M4
- NanoPi Neo4
- ROC-RK3399-PC

---
 configs/nanopc-t4-rk3399_defconfig   | 6 ++++++
 configs/nanopi-m4-rk3399_defconfig   | 6 ++++++
 configs/nanopi-neo4-rk3399_defconfig | 6 ++++++
 configs/roc-pc-rk3399_defconfig      | 6 ++++++
 include/configs/evb_rk3399.h         | 5 +++++
 5 files changed, 29 insertions(+)
configs/nanopc-t4-rk3399_defconfig +6 -0
index bd6d60ff6c..17e8a18d31 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/nanopi-m4-rk3399_defconfig +6 -0
index 74ede13c23..b73b2fdc27 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/nanopi-neo4-rk3399_defconfig +6 -0
index a44124aac0..2ecb50967b 100644
@@ -53,3 +53,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
configs/roc-pc-rk3399_defconfig +6 -0
index 3a051d9b0c..a9f99f992d 100644
@@ -56,3 +56,9 @@ CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_BPP16=y
+CONFIG_VIDEO_BPP32=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
include/configs/evb_rk3399.h +5 -0
index c0b0358893..09eb361655 100644
@@ -6,6 +6,11 @@
 #ifndef __EVB_RK3399_H
 #define __EVB_RK3399_H
 
+#define ROCKCHIP_DEVICE_SETTINGS \
+             "stdin=serial,cros-ec-keyb\0" \
+             "stdout=serial,vidconsole\0" \
+             "stderr=serial,vidconsole\0"
+
 #include <configs/rk3399_common.h>
 
Quoted 7 lines

include/configs/evb_rk3399.h line 16

Quoted 1 line
include/configs/evb_rk3399.h +0 -0
 #if defined(CONFIG_ENV_IS_IN_MMC)

This seems like another commit (along with the question I saw about i.MX FB not showing the right colors) 2cc393f32fd9 needs to be reworked so that we default to enabling everything still but let boards opt out rather than forcing everyone to opt-in as it seems like there's a lot of cases where people need to opt-in and didn't know.

Quoted 3 lines

yes, this evb board config is common across most of the rk3399 defconfig boards. this patch enable hdmi on few rk3399 boards all use same config file, evb_rk3399.h

Yes, the ROCKCHIP_DEVICE_SETTINGS part makes sense, but the rest looks very much like part of we need to rework the commit I mentioned. I don't object to this going in as-is. Anatolij, how goes the rework of things however? I do want to see that get in sooner rather than later so we can sort out other regressions from just a lack of CONFIG options being enabled. Thanks!

Signature · 1 line
Tom
#10 lore raw

Re: [PATCH 4/4] rockchip: Enable HDMI output on rk3399 board w/ HDMI

On Mon, 3 Feb 2020 09:47:08 -0500
Tom Rini [email protected] wrote:
...

Quoted 10 lines
Quoted 3 lines

yes, this evb board config is common across most of the rk3399 defconfig boards. this patch enable hdmi on few rk3399 boards all use same config file, evb_rk3399.h

Yes, the ROCKCHIP_DEVICE_SETTINGS part makes sense, but the rest looks very much like part of we need to rework the commit I mentioned. I don't object to this going in as-is. Anatolij, how goes the rework of things however? I do want to see that get in sooner rather than later so we can sort out other regressions from just a lack of CONFIG options being enabled. Thanks!

A patch [1] for this is under build testing.

[1] http://patchwork.ozlabs.org/patch/1233033

--
Anatolij

#11 lore raw

Re: [PATCH 4/4] rockchip: Enable HDMI output on rk3399 board w/ HDMI

In reply to Jagan Teki

include/configs/evb_rk3399.h line 10

Quoted 2 lines
include/configs/evb_rk3399.h +2 -0
+#define ROCKCHIP_DEVICE_SETTINGS \
+               "stdin=serial,cros-ec-keyb\0" \

This should likely be a usb keyboard and not the CrOS EC keyboard.

Quoted 9 lines
include/configs/evb_rk3399.h +3 -1
+               "stdout=serial,vidconsole\0" \
+               "stderr=serial,vidconsole\0"
+
 #include <configs/rk3399_common.h>
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
--

2.18.0.321.gffc6fa0e3