[PATCH v11 00/24] drm/rockchip: RK356x VOP2 support

Mon Apr 25 12:34:31 UTC 2022

Hello Sascha,

On 4/22/22 09:28, Sascha Hauer wrote:
> It's v11 time. There's only one small change to v10. Discussion seems to
> have settled now. Is there anything left that prevents the series from
> being merged? I'd really like to have it in during the next merge
> window.

Oh yes that'd be awesome :-)

On a RK3568 EVB1 and a Radxa Rock 3 Model A connected to a HP 27f 4K
monitor, using

$ modetest -M rockchip -s 69:{1920x1080,3840x2160}-{30,60}

as well as using weston and glmark2-es2-wayland:

Tested-by: Michael Riesch <michael.riesch at wolfvision.net>

Thanks and best regards,
Michael

> This series still depends on:
> drm/rockchip: Refactor IOMMU initialisation (https://lists.freedesktop.org/archives/dri-devel/2022-April/349548.html)
> arm64: dts: rockchip: add basic dts for the radxa rock3 model a
> 
> Sascha
> 
> Changes since v10:
> - relax mode_valid hook rather than dropping it in hdmi driver
> 
> Changes since v9:
> - rebase on v5.18-rc1
> - Do not register windows which don't have its own framebuffer on RK3566
> - fix mixed up register writes in vop2_setup_dly_for_windows()
> - move call to rockchip_drm_dma_attach_device() from vop2_bind() to vop2_enable()
> - Fix zpos handling
> 
> Changes since v8:
> - make hclk_vo a critical clock instead of enabling it in the hdmi driver
> - Fix vop2_setup_layer_mixer(), reported by Andy Yan
> - Limit planes possible_crtcs to actually existing crtcs
> - simplify vop2_create_crtc() a bit
> 
> Changes since v7:
> - rename hclk to niu
> 
> Changes since v6:
> - Move of_graph parsing out of runtime code to initialization
> 
> Changes since v5:
> - Add new patch to fix dw-hdmi of_graph binding
> - Drop "drm/encoder: Add of_graph port to struct drm_encoder" and solve
>   issue internally in the driver
> - make checkpatch cleaner
> 
> Changes since v4:
> - Reorder patches in a way that binding/dts/driver patches are closer together
> - Drop clk patches already applied by Heiko
> 
> Changes since v3:
> - added changelog to each patch
> - Add 4k support to hdmi driver
> - rebase on v5.17-rc1
> 
> Changes since v2:
> - Add pin names to HDMI supply pin description
> - Add hclk support to HDMI driver
> - Dual license rockchip-vop2 binding, update binding
> - Add HDMI connector to board dts files
> - drop unnecessary gamma_lut registers from vop2
> - Update dclk_vop[012] clock handling, no longer hacks needed
> - Complete regmap conversion
> 
> Changes since v1:
> - drop all unnecessary waiting for frames within atomic modeset and plane update
> - Cluster subwin support removed
> - gamma support removed
> - unnecessary irq_lock removed
> - interrupt handling simplified
> - simplified zpos handling
> - drop is_alpha_support(), use fb->format->has_alpha instead
> - use devm_regulator_get() rather than devm_regulator_get_optional() for hdmi regulators
> - Use fixed number of planes per video port
> - Drop homegrown regmap code from vop2 driver (not complete yet)
> - Add separate include file for vop2 driver to not pollute the vop include
> 
> Andy Yan (1):
>   drm: rockchip: Add VOP2 driver
> 
> Benjamin Gaignard (1):
>   dt-bindings: display: rockchip: dw-hdmi: Add compatible for rk3568
>     HDMI
> 
> Douglas Anderson (2):
>   drm/rockchip: dw_hdmi: Use auto-generated tables
>   drm/rockchip: dw_hdmi: Set cur_ctr to 0 always
> 
> Michael Riesch (2):
>   arm64: dts: rockchip: enable vop2 and hdmi tx on quartz64a
>   arm64: dts: rockchip: enable vop2 and hdmi tx on rock-3a
> 
> Nickey Yang (1):
>   drm/rockchip: dw_hdmi: add default 594Mhz clk for 4K at 60hz
> 
> Sascha Hauer (17):
>   clk: rk3568: Mark hclk_vo as critical
>   drm/rockchip: Embed drm_encoder into rockchip_decoder
>   drm/rockchip: Add crtc_endpoint_id to rockchip_encoder
>   drm/rockchip: dw_hdmi: rename vpll clock to reference clock
>   dt-bindings: display: rockchip: dw-hdmi: use "ref" as clock name
>   arm64: dts: rockchip: rk3399: rename HDMI ref clock to 'ref'
>   drm/rockchip: dw_hdmi: add rk3568 support
>   drm/rockchip: dw_hdmi: add regulator support
>   dt-bindings: display: rockchip: dw-hdmi: Add regulator support
>   drm/rockchip: dw_hdmi: relax mode_valid hook
>   dt-bindings: display: rockchip: dw-hdmi: Make unwedge pinctrl optional
>   arm64: dts: rockchip: rk356x: Add VOP2 nodes
>   arm64: dts: rockchip: rk356x: Add HDMI nodes
>   arm64: dts: rockchip: rk3568-evb: Enable VOP2 and hdmi
>   drm/rockchip: Make VOP driver optional
>   dt-bindings: display: rockchip: Add binding for VOP2
>   dt-bindings: display: rockchip: dw-hdmi: fix ports description
> 
>  .../display/rockchip/rockchip,dw-hdmi.yaml    |   46 +-
>  .../display/rockchip/rockchip-vop2.yaml       |  140 +
>  arch/arm64/boot/dts/rockchip/rk3399.dtsi      |    2 +-
>  .../boot/dts/rockchip/rk3566-quartz64-a.dts   |   47 +
>  arch/arm64/boot/dts/rockchip/rk3566.dtsi      |    4 +
>  .../boot/dts/rockchip/rk3568-evb1-v10.dts     |   47 +
>  .../boot/dts/rockchip/rk3568-rock-3a.dts      |   47 +
>  arch/arm64/boot/dts/rockchip/rk3568.dtsi      |    4 +
>  arch/arm64/boot/dts/rockchip/rk356x.dtsi      |   83 +
>  drivers/clk/rockchip/clk-rk3568.c             |    1 +
>  drivers/gpu/drm/rockchip/Kconfig              |   14 +
>  drivers/gpu/drm/rockchip/Makefile             |    4 +-
>  .../gpu/drm/rockchip/analogix_dp-rockchip.c   |   32 +-
>  drivers/gpu/drm/rockchip/cdn-dp-core.c        |   18 +-
>  drivers/gpu/drm/rockchip/cdn-dp-core.h        |    2 +-
>  .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c   |   17 +-
>  drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c   |  257 +-
>  drivers/gpu/drm/rockchip/inno_hdmi.c          |   32 +-
>  drivers/gpu/drm/rockchip/rk3066_hdmi.c        |   34 +-
>  drivers/gpu/drm/rockchip/rockchip_drm_drv.c   |   36 +-
>  drivers/gpu/drm/rockchip/rockchip_drm_drv.h   |   20 +-
>  drivers/gpu/drm/rockchip/rockchip_drm_fb.c    |    2 +
>  drivers/gpu/drm/rockchip/rockchip_drm_vop.h   |   15 +
>  drivers/gpu/drm/rockchip/rockchip_drm_vop2.c  | 2706 +++++++++++++++++
>  drivers/gpu/drm/rockchip/rockchip_drm_vop2.h  |  477 +++
>  drivers/gpu/drm/rockchip/rockchip_lvds.c      |   26 +-
>  drivers/gpu/drm/rockchip/rockchip_vop2_reg.c  |  281 ++
>  include/dt-bindings/soc/rockchip,vop2.h       |   14 +
>  28 files changed, 4235 insertions(+), 173 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml
>  create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
>  create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
>  create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
>  create mode 100644 include/dt-bindings/soc/rockchip,vop2.h
> 