Skip to content

Integrate meta-seco-rk/linux-seco-rk/ap/vop2-default-plane-masks

Commit: edgehog/layers/seco/meta-seco-rk@b8aa14ca

Integrate linux-seco-rk/ap/vop2-default-plane-masks

--

Commit: edgehog/bsp/rockchip/linux-seco-rk@2b0a5be2

[DRIVER][RK3568][RK3588] add default configuration for vop2 drm planes

Based on upstream commit: 00424a589d3d3a242748e915f42b3ea7b01e611d https://github.com/rockchip-linux/kernel/commit/00424a589d3d3a242748e915f42b3ea7b01e611d

This commit adds code in the VOP2 driver that automatically assigns planes to video ports in rk3568 and rk3588 when the configuration is not provided by the dts, or when the provided configuration is invalid.

The function vop2_plane_mask_assign determines how many video ports are active and assigns the planes (SMART/ESMART/CLUSTER) accordingly.

In E09 this allows to enable multiple video outputs by combining the overlays. (E.g. to enable HDMI+eDP, you can simply apply both HDMI and eDP dtbos in u-boot) This isn't possible without this patch, because in rk3568/rk3588 each plane (SMART/ESMART/CLUSTER) must be assigned to a video port, otherwise some video ports don't work properly, so the overlays would conflict with each other (because they all would have to assign all planes).

------- Original commit message --------------

drm/rockchip: vop2: add support to assign plane mask by default

If not to enable uboot logo, neither to set plane mask in dts. For RK3568 and RK3588, it is needed to assign plane mask by default.

Signed-off-by: Damon Ding damon.ding@rock-chips.com Change-Id: I9ebbc32b89b503784a225cc482e7cbde15508843

Merge request reports