From 452eb0f5ce8666635b7d32a398af0e55b50e5f0d Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Wed, 4 Jan 2023 17:36:10 +0800 Subject: [PATCH] rockchip: fix DRM dependencies for kernel 6.1 Signed-off-by: Tianling Shen --- target/linux/rockchip/modules.mk | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk index a3fa9256cf..f95c6c81c3 100644 --- a/target/linux/rockchip/modules.mk +++ b/target/linux/rockchip/modules.mk @@ -5,7 +5,8 @@ define KernelPackage/drm-rockchip SUBMENU:=$(VIDEO_MENU) TITLE:=Rockchip DRM support - DEPENDS:=@TARGET_rockchip +kmod-backlight +kmod-drm-kms-helper +kmod-multimedia-input + DEPENDS:=@TARGET_rockchip +kmod-backlight +kmod-drm-kms-helper \ + +kmod-multimedia-input +!LINUX_5_15:kmod-drm-display-helper KCONFIG:= \ CONFIG_DRM_ROCKCHIP \ CONFIG_DRM_LOAD_EDID_FIRMWARE=y \ @@ -16,17 +17,19 @@ define KernelPackage/drm-rockchip CONFIG_PHY_ROCKCHIP_INNO_HDMI \ CONFIG_DRM_DW_HDMI \ CONFIG_DRM_DW_HDMI_CEC \ - CONFIG_ROCKCHIP_VOP=y \ - CONFIG_ROCKCHIP_VOP2=y \ CONFIG_ROCKCHIP_ANALOGIX_DP=n \ CONFIG_ROCKCHIP_CDN_DP=n \ CONFIG_ROCKCHIP_DW_HDMI=y \ - CONFIG_ROCKCHIP_INNO_HDMI=y \ CONFIG_ROCKCHIP_DW_MIPI_DSI=y \ + CONFIG_ROCKCHIP_INNO_HDMI=y \ CONFIG_ROCKCHIP_LVDS=y \ CONFIG_ROCKCHIP_RGB=n \ CONFIG_ROCKCHIP_RK3066_HDMI=n \ + CONFIG_ROCKCHIP_VOP=y \ + CONFIG_ROCKCHIP_VOP2=y \ CONFIG_DRM_DP_AUX_BUS \ + CONFIG_DRM_GEM_CMA_HELPER@lt6.1 \ + CONFIG_DRM_GEM_DMA_HELPER@ge6.1 \ CONFIG_DRM_PANEL=y \ CONFIG_DRM_PANEL_BRIDGE=y \ CONFIG_DRM_PANEL_SIMPLE @@ -34,11 +37,12 @@ define KernelPackage/drm-rockchip $(LINUX_DIR)/drivers/gpu/drm/bridge/synopsys/dw-hdmi.ko \ $(LINUX_DIR)/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.ko \ $(LINUX_DIR)/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.ko \ - $(LINUX_DIR)/drivers/media/cec/core/cec.ko \ $(LINUX_DIR)/drivers/phy/rockchip/phy-rockchip-inno-hdmi.ko \ - $(LINUX_DIR)/drivers/gpu/drm/drm_dp_aux_bus.ko \ + $(LINUX_DIR)/drivers/gpu/drm/drm_dp_aux_bus.ko@lt5.19 \ + $(LINUX_DIR)/drivers/gpu/drm/drm_dma_helper.ko@ge6.1 \ $(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko \ - $(LINUX_DIR)/drivers/gpu/drm/rockchip/rockchipdrm.ko + $(LINUX_DIR)/drivers/gpu/drm/rockchip/rockchipdrm.ko \ + $(LINUX_DIR)/drivers/media/cec/core/cec.ko AUTOLOAD:=$(call AutoProbe,rockchipdrm phy-rockchip-inno-hdmi dw-hdmi-cec) endef