Skip to content
Permalink
Browse files
drm: forward port of VOP2 driver
squashed:

try to fix vop_plane_atomic_async_update/vop_atomic_plane_destroy_state

mixed by cherry-pick

fix conflict in vop_reg.c

hopefully fixed conflicts in drm_vop.c

fix different type rockchip_drm_driver

misc fixes

drop format_modifiers

drop rk3188

fix redefinitions

fix vop_plane_atomic_check drm_plane_state vs. drm_atomic_state

fix vop_plane_atomic_update

drop vop_plane_atomic_async_{check,update}, atomic_begin and duplicate plane_helper_funcs

fix vop_crtc_atomic_check

fix vop_crtc_atomic_{enable,flush}

fix to_vop_plane_state in atomic_{check,update}

vop2: fix param of atomic callbacks
  • Loading branch information
Benjamin Gaignard authored and frank-w committed Oct 21, 2021
1 parent ba24393 commit 7853190f99eb12f73fef92b394355e81b2b491ef
Show file tree
Hide file tree
Showing 15 changed files with 14,356 additions and 1,925 deletions.
@@ -1,14 +1,13 @@
# SPDX-License-Identifier: GPL-2.0-only
config DRM_ROCKCHIP
tristate "DRM Support for Rockchip"
depends on DRM && ROCKCHIP_IOMMU
depends on DRM
select DRM_GEM_CMA_HELPER
select DRM_KMS_HELPER
select DRM_PANEL
select VIDEOMODE_HELPERS
select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
select DRM_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
select DRM_RGB if ROCKCHIP_RGB
select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI
select GENERIC_PHY_MIPI_DPHY if ROCKCHIP_DW_MIPI_DSI
@@ -72,6 +71,13 @@ config ROCKCHIP_LVDS
support LVDS, rgb, dual LVDS output mode. say Y to enable its
driver.

config ROCKCHIP_DRM_TVE
bool "Rockchip TVE support"
depends on DRM_ROCKCHIP
help
Choose this option to enable support for Rockchip TVE controllers.
say Y to enable its driver.

config ROCKCHIP_RGB
bool "Rockchip RGB support"
depends on DRM_ROCKCHIP
@@ -82,11 +88,12 @@ config ROCKCHIP_RGB
and serial RGB format to panel or connect to a conversion chip.
say Y to enable its driver.

config ROCKCHIP_RK3066_HDMI
bool "Rockchip specific extensions for RK3066 HDMI"
config DRM_ROCKCHIP_VVOP
tristate "Rockchip virtual VOP drm driver"
depends on DRM_ROCKCHIP
help
This selects support for Rockchip SoC specific extensions
for the RK3066 HDMI driver. If you want to enable
HDMI on RK3066 based SoC, you should select this option.
Say y here if you want use some module of rockchip drm, but
don't need a real vop driver(et: you just want rockchip drm
gem driver to allocate memory).

endif
@@ -4,16 +4,23 @@
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \
rockchip_drm_gem.o rockchip_drm_vop.o rockchip_vop_reg.o
rockchip_drm_gem.o rockchip_drm_psr.o \
rockchip_drm_vop.o rockchip_vop_reg.o \
rockchip_drm_vop2.o rockchip_vop2_reg.o
rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o

rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
#rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o \
cdn-dp-link-training.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi-rockchip.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o
rockchipdrm-$(CONFIG_ROCKCHIP_DRM_TVE) += rockchip_drm_tve.o
rockchipdrm-$(CONFIG_ROCKCHIP_RGB) += rockchip_rgb.o
rockchipdrm-$(CONFIG_ROCKCHIP_RK3066_HDMI) += rk3066_hdmi.o
rockchipdrm-$(CONFIG_DRM_ROCKCHIP_VVOP) += rockchip_drm_vvop.o

obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o

#obj-$(CONFIG_ROCKCHIP_EBC_DEV) += ebc-dev/
#obj-$(CONFIG_DRM_ROCKCHIP_RK618) += rk618/
#obj-$(CONFIG_DRM_ROCKCHIP_RK628) += rk628/

0 comments on commit 7853190

Please sign in to comment.