| Message ID | 20231211115547.1784587-1-andyshrk@163.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Add VOP2 support on rk3588 | expand |
On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > This patch sets aims at enable the VOP2 support on rk3588. > > Main feature of VOP2 on rk3588: > Four video ports: > VP0 Max 4096x2160 > VP1 Max 4096x2160 > VP2 Max 4096x2160 > VP3 Max 2048x1080 > > [...] Applied, thanks! [09/16] dt-bindings: soc: rockchip: add rk3588 vop/vo syscon commit: 1a648f8b7994dca4c323911607cf28d1eb44c198 Best regards,
On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > This patch sets aims at enable the VOP2 support on rk3588. > > Main feature of VOP2 on rk3588: > Four video ports: > VP0 Max 4096x2160 > VP1 Max 4096x2160 > VP2 Max 4096x2160 > VP3 Max 2048x1080 > > [...] Applied, thanks! [01/16] drm/rockchip: move output interface related definition to rockchip_drm_drv.h commit: 8c8546546f256f834e9c7cab48e5946df340d1a8 [02/16] Revert "drm/rockchip: vop2: Use regcache_sync() to fix suspend/resume" commit: 81a06f1d02e588cfa14c5e5953d9dc50b1d404be [03/16] drm/rockchip: vop2: set half_block_en bit in all mode commit: bebad6bd4fbdc448ad3b337ad281b813e68f6f53 [04/16] drm/rockchip: vop2: clear afbc en and transform bit for cluster window at linear mode commit: 20529a68307feed00dd3d431d3fff0572616b0f2 [05/16] drm/rockchip: vop2: Add write mask for VP config done commit: d1f8face0fc1298c88ef4a0479c3027b46ca2c77 [06/16] drm/rockchip: vop2: Set YUV/RGB overlay mode commit: dd49ee4614cfb0b1f627c4353b60cecfe998a374 [07/16] drm/rockchip: vop2: set bg dly and prescan dly at vop2_post_config commit: 075a5b3969becb1ebc2f1d4fa1a1fe9163679273 [08/16] drm/rockchip: vop2: rename grf to sys_grf commit: c408af1afc4b74ea6df69e0313be97f1f83e981a Best regards,
On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > This patch sets aims at enable the VOP2 support on rk3588. > > Main feature of VOP2 on rk3588: > Four video ports: > VP0 Max 4096x2160 > VP1 Max 4096x2160 > VP2 Max 4096x2160 > VP3 Max 2048x1080 > > [...] Applied, thanks! [10/16] dt-bindings: display: vop2: Add rk3588 support commit: 4ccdc92c1fea732fac8f3438d6288719055fa141 [11/16] dt-bindings: rockchip,vop2: Add more endpoint definition commit: dc7226acacc6502291446f9e33cf96246ec49a30 [12/16] drm/rockchip: vop2: Add support for rk3588 commit: 5a028e8f062fc862f051f8e62a0d5a1abac91955 [13/16] drm/rockchip: vop2: rename VOP_FEATURE_OUTPUT_10BIT to VOP2_VP_FEATURE_OUTPUT_10BIT commit: 9d7fe7704d534c2d043aff2987f10671a8b4373d [16/16] MAINTAINERS: Add myself as a reviewer for rockchip drm commit: 6c3ab21f37a97a868193ccbeb8a492e51210ff31 I skipped the debugfs patch for now, as I need to look at that separately and of course the dts patch as that needs to wait for iommu maintainers to pick up the binding addition. Best regards,
Hi Heiko: On 12/13/23 22:46, Heiko Stuebner wrote: > On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: >> From: Andy Yan <andy.yan@rock-chips.com> >> >> This patch sets aims at enable the VOP2 support on rk3588. >> >> Main feature of VOP2 on rk3588: >> Four video ports: >> VP0 Max 4096x2160 >> VP1 Max 4096x2160 >> VP2 Max 4096x2160 >> VP3 Max 2048x1080 >> >> [...] > > Applied, thanks! > > [10/16] dt-bindings: display: vop2: Add rk3588 support > commit: 4ccdc92c1fea732fac8f3438d6288719055fa141 > [11/16] dt-bindings: rockchip,vop2: Add more endpoint definition > commit: dc7226acacc6502291446f9e33cf96246ec49a30 > [12/16] drm/rockchip: vop2: Add support for rk3588 > commit: 5a028e8f062fc862f051f8e62a0d5a1abac91955 > [13/16] drm/rockchip: vop2: rename VOP_FEATURE_OUTPUT_10BIT to VOP2_VP_FEATURE_OUTPUT_10BIT > commit: 9d7fe7704d534c2d043aff2987f10671a8b4373d > [16/16] MAINTAINERS: Add myself as a reviewer for rockchip drm > commit: 6c3ab21f37a97a868193ccbeb8a492e51210ff31 > > > I skipped the debugfs patch for now, as I need to look at that separately > and of course the dts patch as that needs to wait for iommu maintainers > to pick up the binding addition. That's fine. Thanks for picking these series. > > > Best regards,
On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > This patch sets aims at enable the VOP2 support on rk3588. > > Main feature of VOP2 on rk3588: > Four video ports: > VP0 Max 4096x2160 > VP1 Max 4096x2160 > VP2 Max 4096x2160 > VP3 Max 2048x1080 > > [...] Applied, thanks! [15/16] arm64: dts: rockchip: Add vop on rk3588 commit: d895dbef3f3a31ab50491bb48552e798cf555987 Best regards,
Hi Heiko, On 12/14/23 14:46, Andy Yan wrote: > Hi Heiko: > > On 12/13/23 22:46, Heiko Stuebner wrote: >> On Mon, 11 Dec 2023 19:55:47 +0800, Andy Yan wrote: >>> From: Andy Yan <andy.yan@rock-chips.com> >>> >>> This patch sets aims at enable the VOP2 support on rk3588. >>> >>> Main feature of VOP2 on rk3588: >>> Four video ports: >>> VP0 Max 4096x2160 >>> VP1 Max 4096x2160 >>> VP2 Max 4096x2160 >>> VP3 Max 2048x1080 >>> >>> [...] >> >> Applied, thanks! >> >> [10/16] dt-bindings: display: vop2: Add rk3588 support >> commit: 4ccdc92c1fea732fac8f3438d6288719055fa141 >> [11/16] dt-bindings: rockchip,vop2: Add more endpoint definition >> commit: dc7226acacc6502291446f9e33cf96246ec49a30 >> [12/16] drm/rockchip: vop2: Add support for rk3588 >> commit: 5a028e8f062fc862f051f8e62a0d5a1abac91955 >> [13/16] drm/rockchip: vop2: rename VOP_FEATURE_OUTPUT_10BIT to VOP2_VP_FEATURE_OUTPUT_10BIT >> commit: 9d7fe7704d534c2d043aff2987f10671a8b4373d >> [16/16] MAINTAINERS: Add myself as a reviewer for rockchip drm >> commit: 6c3ab21f37a97a868193ccbeb8a492e51210ff31 >> >> >> I skipped the debugfs patch for now, as I need to look at that separately >> and of course the dts patch as that needs to wait for iommu maintainers >> to pick up the binding addition. > > That's fine. Thanks for picking these series. Would you please take a look at the debugfs patch when it's convenient for you? It's really useful for development and bug hunting. > >> >> >> Best regards,
From: Andy Yan <andy.yan@rock-chips.com> This patch sets aims at enable the VOP2 support on rk3588. Main feature of VOP2 on rk3588: Four video ports: VP0 Max 4096x2160 VP1 Max 4096x2160 VP2 Max 4096x2160 VP3 Max 2048x1080 4 4K Cluster windows with AFBC/line RGB and AFBC-only YUV support 4 4K Esmart windows with line RGB/YUV support The current version support all the 8 windows with all the suppported plane format. And we don't have a upstreamed encoder/connector(HDMI/DP) for rk3588 yet, Cristian from collabora is working on adding upstream support for HDMI on rk3588. My current test(1080P/4KP60) is runing with a HDMI driver pick from downstream bsp kernel. A branch based on linux-6.7 rc4 containing all the series and HDMI driver(not compatible with mainline rk3568 hdmi) picked from downstream bsp kernel is available [0]. [0]https://github.com/andyshrk/linux/commits/rk3588-vop2-upstream-linux-6.7-rc4-2023-12-07 Changes in v5: - remove unused dts property - move blank line below the status=disabled in vop dt node - split iommu dt binding patch from this series Changes in v4: - drop redundant description. - use full stop at all the description's end. - address Krzysztof's review in v3 - keep all VOP2_FEATURE_HAS_xxx macros increase in order. - check NULL pointer at right place - fix the index of fb->obj - drop explicitly cast of void pointer - make the register dump code as a common function. Changes in v3: - split from the vop2 driver patch - put bool variable yuv_overlay next to other bool variable - define macro for RK3568_OVL_CTRL__YUV_MODE - just write RK3568_OVL_CTRL register once in function vop2_setup_layer_mixer - constrain properties in allOf:if:then - some description updates - change the subject as Krzysztof suggested, and add his ACK - add braces for x in macro vop2_output_if_is_yyy(x) - clear the bits of a mask before setting it in rk3588_set_intf_mux - add more comments. - put regs dump info in vop2_data Changes in v2: - fix errors when running 'make DT_CHECKER_FLAGS=-m dt_binding_check' - split form vop driver patch - add rk3588_ prefix for functions which are rk3588 only - make some calculation as fixed value and keep calculation formula as comment - check return value for some cru calculation functions. - check return value for syscon_regmap_lookup_by_phandle - add NV20/NV30 for esmart plane Andy Yan (16): drm/rockchip: move output interface related definition to rockchip_drm_drv.h Revert "drm/rockchip: vop2: Use regcache_sync() to fix suspend/resume" drm/rockchip: vop2: set half_block_en bit in all mode drm/rockchip: vop2: clear afbc en and transform bit for cluster window at linear mode drm/rockchip: vop2: Add write mask for VP config done drm/rockchip: vop2: Set YUV/RGB overlay mode drm/rockchip: vop2: set bg dly and prescan dly at vop2_post_config drm/rockchip: vop2: rename grf to sys_grf dt-bindings: soc: rockchip: add rk3588 vop/vo syscon dt-bindings: display: vop2: Add rk3588 support dt-bindings: rockchip,vop2: Add more endpoint definition drm/rockchip: vop2: Add support for rk3588 drm/rockchip: vop2: rename VOP_FEATURE_OUTPUT_10BIT to VOP2_VP_FEATURE_OUTPUT_10BIT drm/rockchip: vop2: Add debugfs support arm64: dts: rockchip: Add vop on rk3588 MAINTAINERS: Add myself as a reviewer for rockchip drm .../display/rockchip/rockchip-vop2.yaml | 100 ++- .../devicetree/bindings/soc/rockchip/grf.yaml | 2 + MAINTAINERS | 1 + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 83 ++ .../gpu/drm/rockchip/analogix_dp-rockchip.c | 1 - drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 - .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 1 - drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 1 - drivers/gpu/drm/rockchip/inno_hdmi.c | 1 - drivers/gpu/drm/rockchip/rk3066_hdmi.c | 1 - drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 18 + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 12 +- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 761 +++++++++++++++++- drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 111 ++- drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 - drivers/gpu/drm/rockchip/rockchip_rgb.c | 1 - drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 414 +++++++++- include/dt-bindings/soc/rockchip,vop2.h | 4 + 18 files changed, 1420 insertions(+), 94 deletions(-)