From: Andy Yan <[email protected]>
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 v4:
- fix the POST_BUF_EMPTY irq when set mode
- use full stop at all the description's end.
- address Krzysztof's review about dt-binding in v3
- keep all VOP2_FEATURE_HAS_xxx macros increase in order.
- address Sascha's review about debugfs
- Add const for rockchip,rk3588-iommu compatible
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 (17):
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
dt-bindings: iommu: rockchip: Add Rockchip RK3588
arm64: dts: rockchip: Add vop on rk3588
MAINTAINERS: Add myself as a reviewer for rockchip drm
.../display/rockchip/rockchip-vop2.yaml | 100 ++-
.../bindings/iommu/rockchip,iommu.yaml | 11 +-
.../devicetree/bindings/soc/rockchip/grf.yaml | 2 +
MAINTAINERS | 1 +
arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 96 +++
.../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 +
19 files changed, 1441 insertions(+), 97 deletions(-)
--
2.34.1
Hi Andy,
Am Donnerstag, 7. Dezember 2023, 08:59:06 CET schrieb Andy Yan:
> From: Andy Yan <[email protected]>
>
> 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 v4:
> - fix the POST_BUF_EMPTY irq when set mode
> - use full stop at all the description's end.
> - address Krzysztof's review about dt-binding in v3
> - keep all VOP2_FEATURE_HAS_xxx macros increase in order.
> - address Sascha's review about debugfs
> - Add const for rockchip,rk3588-iommu compatible
very nice, the error messages on "mode changes" are gone now.
Display and even combination with panthor still work of my rk3588-board
Tested-by: Heiko Stuebner <[email protected]>
Hi Heiko:
On 12/9/23 00:07, Heiko Stübner wrote:
> Hi Andy,
>
> Am Donnerstag, 7. Dezember 2023, 08:59:06 CET schrieb Andy Yan:
>> From: Andy Yan <[email protected]>
>>
>> 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 v4:
>> - fix the POST_BUF_EMPTY irq when set mode
>> - use full stop at all the description's end.
>> - address Krzysztof's review about dt-binding in v3
>> - keep all VOP2_FEATURE_HAS_xxx macros increase in order.
>> - address Sascha's review about debugfs
>> - Add const for rockchip,rk3588-iommu compatible
>
> very nice, the error messages on "mode changes" are gone now.
> Display and even combination with panthor still work of my rk3588-board
>
> Tested-by: Heiko Stuebner <[email protected]>
Thanks for your honorable work on this platform, and thanks for you test and review.
So can I add your Tested-by for all this series form PATCH 1~16 in next version?
>
>
>
>
>
> _______________________________________________
> Linux-rockchip mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-rockchip