Commit 604be855 authored by Andy Yan's avatar Andy Yan Committed by Heiko Stuebner
Browse files

drm/rockchip: Add VOP2 driver 



The VOP2 unit is found on Rockchip SoCs beginning with rk3566/rk3568.
It replaces the VOP unit found in the older Rockchip SoCs.

This driver has been derived from the downstream Rockchip Kernel and
heavily modified:

- All nonstandard DRM properties have been removed
- dropped struct vop2_plane_state and pass around less data between
  functions
- Dropped all DRM_FORMAT_* not known on upstream
- rework register access to get rid of excessively used macros
- Drop all waiting for framesyncs

The driver is tested with HDMI and MIPI-DSI display on a RK3568-EVB
board. Overlay support is tested with the modetest utility. AFBC support
on the cluster windows is tested with weston-simple-dmabuf-egl on
weston using the (yet to be upstreamed) panfrost driver support.

Signed-off-by: default avatarAndy Yan <andy.yan@rock-chips.com>
Co-Developed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Tested-by: default avatarMichael Riesch <michael.riesch@wolfvision.net>
[dt-binding-header:]
Acked-by: default avatarRob Herring <robh@kernel.org>
[moved dt-binding header from dt-nodes patch to here
 and made checkpatch --strict happier]
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220422072841.2206452-23-s.hauer@pengutronix.de
parent b382406a

drivers/gpu/drm/rockchip/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ config ROCKCHIP_VOP 
	  This selects support for the VOP driver. You should enable it

	  on older SoCs.



config ROCKCHIP_VOP2

	bool "Rockchip VOP2 driver"

	help

	  This selects support for the VOP2 driver. The VOP2 hardware is

	  first found on the RK3568.



config ROCKCHIP_ANALOGIX_DP

	bool "Rockchip specific extensions for Analogix DP driver"

	depends on ROCKCHIP_VOP

drivers/gpu/drm/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \

		rockchip_drm_gem.o



rockchipdrm-$(CONFIG_ROCKCHIP_VOP2) += rockchip_drm_vop2.o rockchip_vop2_reg.o

rockchipdrm-$(CONFIG_ROCKCHIP_VOP) += rockchip_drm_vop.o rockchip_vop_reg.o

rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o

rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -482,6 +482,7 @@ static int __init rockchip_drm_init(void) 


	num_rockchip_sub_drivers = 0;

	ADD_ROCKCHIP_SUB_DRIVER(vop_platform_driver, CONFIG_ROCKCHIP_VOP);

	ADD_ROCKCHIP_SUB_DRIVER(vop2_platform_driver, CONFIG_ROCKCHIP_VOP2);

	ADD_ROCKCHIP_SUB_DRIVER(rockchip_lvds_driver,

				CONFIG_ROCKCHIP_LVDS);

	ADD_ROCKCHIP_SUB_DRIVER(rockchip_dp_driver,

drivers/gpu/drm/rockchip/rockchip_drm_drv.h

+5 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#define ROCKCHIP_MAX_FB_BUFFER	3

#define ROCKCHIP_MAX_CONNECTOR	2

#define ROCKCHIP_MAX_CRTC	2

#define ROCKCHIP_MAX_CRTC	4



struct drm_device;

struct drm_connector;
@@ -31,6 +31,9 @@ struct rockchip_crtc_state { 
	int output_bpc;

	int output_flags;

	bool enable_afbc;

	u32 bus_format;

	u32 bus_flags;

	int color_space;

};

#define to_rockchip_crtc_state(s) \

		container_of(s, struct rockchip_crtc_state, base)
@@ -72,6 +75,7 @@ extern struct platform_driver rockchip_dp_driver; 
extern struct platform_driver rockchip_lvds_driver;

extern struct platform_driver vop_platform_driver;

extern struct platform_driver rk3066_hdmi_driver;

extern struct platform_driver vop2_platform_driver;



static inline struct rockchip_encoder *to_rockchip_encoder(struct drm_encoder *encoder)

{

drivers/gpu/drm/rockchip/rockchip_drm_fb.c

+2 −0
Original line number Diff line number Diff line
@@ -134,4 +134,6 @@ void rockchip_drm_mode_config_init(struct drm_device *dev) 


	dev->mode_config.funcs = &rockchip_drm_mode_config_funcs;

	dev->mode_config.helper_private = &rockchip_mode_config_helpers;



	dev->mode_config.normalize_zpos = true;

}