From f07434ac6df5336b3bd7867c69e3c341c4428d7c Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Wed, 15 Dec 2021 23:10:09 +0800 Subject: [PATCH] rockchip: fixes module build error on 5.10 Fixes: #8484 --- target/linux/rockchip/modules.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk index 9349507f2..4ad49b57e 100644 --- a/target/linux/rockchip/modules.mk +++ b/target/linux/rockchip/modules.mk @@ -6,7 +6,8 @@ define KernelPackage/drm-rockchip SUBMENU:=$(VIDEO_MENU) TITLE:=Rockchip DRM support DEPENDS:=@TARGET_rockchip +kmod-backlight +kmod-drm-kms-helper +kmod-multimedia-input - KCONFIG:=CONFIG_DRM_ROCKCHIP \ + KCONFIG:= \ + CONFIG_DRM_ROCKCHIP \ CONFIG_DRM_LOAD_EDID_FIRMWARE=y \ CONFIG_DRM_FBDEV_EMULATION=y \ CONFIG_DRM_FBDEV_OVERALLOC=100 \ @@ -15,10 +16,14 @@ define KernelPackage/drm-rockchip CONFIG_PHY_ROCKCHIP_INNO_HDMI \ CONFIG_DRM_DW_HDMI \ CONFIG_DRM_DW_HDMI_CEC \ + 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_LVDS=y \ + CONFIG_ROCKCHIP_RGB=n \ + CONFIG_ROCKCHIP_RK3066_HDMI=n \ CONFIG_DRM_PANEL \ CONFIG_DRM_PANEL_BRIDGE \ CONFIG_DRM_PANEL_SIMPLE @@ -26,7 +31,8 @@ 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/cec.ko \ + $(LINUX_DIR)/drivers/media/cec/cec.ko@lt5.10 \ + $(LINUX_DIR)/drivers/media/cec/core/cec.ko@ge5.10 \ $(LINUX_DIR)/drivers/phy/rockchip/phy-rockchip-inno-hdmi.ko \ $(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko \ $(LINUX_DIR)/drivers/gpu/drm/rockchip/rockchipdrm.ko