This series provides HDMI enablement for the RK3399 and will support video console on the RK3399 either with VOP-lit or VOP-big: - pinctrl and clk support for the hdmi node - a refactoring of rk_vop.c and rk_hdmi.c to allow for the minor differences between the RK3288 and RK3399 VOP and HDMI blocks
With this version, it has been rebased to Simon's next branch and requires the (recently submitted) fix for the RK8xx power manager driver to work reliably.
This has been tested using 'bmp display' and 'setenv stdout vidconsole' on the RK3399-Q7 with various HDMI monitors, both for VOP-lit and VOP-big (setting the other one to 'disabled').
Changes in v3: - splits the VOP driver into SOC-specific and common portions - moves the "maximum x" and "maximum y" resolution config into Kconfig (instead of having hard-coded values that may need to be revised each time someone adds a new device or new features) - split into separate drivers for the SOC-specific portion of the driver - rebase to sjg/next - enable both hdmi and vopb (as both VOPs are now disabled by default) - enable RK8XX support instead to RK808 support (rebased to sjg/next)
Changes in v2: - renamed to CONFIG_DW_HDMI (from CONFIG_DESIGNWARE_HDMI) for consistency with naming in the MMC and USB subsystems - removed DEBUG from the patch (as was done in our production branches, but missing from the patch-prep branch) - updated SJG's comment (with a TODO for the RK3288) to reflect the new code structure - rebase to master after CMD_BMP was migrated to Kconfig - don't device CONFIG_BMP_24BPP twice in config_whitelist (apparently there had been both the _24BPP and the _24BMP whitelisted before and I didn't even spot it ... thanks go to Simon for catching this) - enable SYS_WHITE_ON_BLACK via defconfig - enable CMD_BMP in the puma-rk3399_defconfig (following a rebase to the upstream master after CMD_BMP was migrate to Kconfig)
Philipp Tomsich (8): rockchip: video: introduce CONFIG_DW_HDMI and select for Rockchip HDMI rockchip: video: rk3399: enable HDMI output (from the rk_vop) for the RK3399 rockchip: video: rk3399: add HDMI TX support on the RK3399 rockchip: dts: rk3399: enable HDMI output in the DTS video: bmp: rename CONFIG_BMP_24BMP to CONFIG_BMP_24BPP rockchip: board: puma_rk3399: enable BMP_16BPP, BMP_24BPP and BMP_32BPP rockchip: defconfig: puma-rk3399: enable RK808 support rockchip: defconfig: puma-rk3399: update defconfig with video-support
arch/arm/dts/rk3399-puma.dts | 9 ++ arch/arm/dts/rk3399.dtsi | 39 +++++ arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 3 + arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 ++ common/lcd.c | 4 +- configs/puma-rk3399_defconfig | 12 ++ drivers/video/Kconfig | 9 ++ drivers/video/Makefile | 1 + drivers/video/rockchip/Kconfig | 30 +++- drivers/video/rockchip/Makefile | 6 +- drivers/video/rockchip/rk3288_hdmi.c | 116 +++++++++++++++ drivers/video/rockchip/rk3288_vop.c | 95 ++++++++++++ drivers/video/rockchip/rk3399_hdmi.c | 81 +++++++++++ drivers/video/rockchip/rk3399_vop.c | 105 ++++++++++++++ drivers/video/rockchip/rk_hdmi.c | 114 ++++----------- drivers/video/rockchip/rk_hdmi.h | 32 ++++ drivers/video/rockchip/rk_vop.c | 185 ++++++++++++------------ drivers/video/rockchip/rk_vop.h | 32 ++++ drivers/video/video_bmp.c | 4 +- include/configs/brxre1.h | 2 +- include/configs/puma_rk3399.h | 4 +- scripts/config_whitelist.txt | 1 - 22 files changed, 698 insertions(+), 197 deletions(-) create mode 100644 drivers/video/rockchip/rk3288_hdmi.c create mode 100644 drivers/video/rockchip/rk3288_vop.c create mode 100644 drivers/video/rockchip/rk3399_hdmi.c create mode 100644 drivers/video/rockchip/rk3399_vop.c create mode 100644 drivers/video/rockchip/rk_hdmi.h create mode 100644 drivers/video/rockchip/rk_vop.h