From 84037ac8844e3e0a2b18ad2416b00de48022e8b2 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 29 May 2023 13:51:08 +0800 Subject: [PATCH] rockchip: fix kernel dependencies Signed-off-by: Tianling Shen --- package/kernel/linux/modules/video.mk | 4 ++-- target/linux/rockchip/modules.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 28f7739686..63cd9618fe 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -449,7 +449,7 @@ $(eval $(call KernelPackage,drm-imx-ldb)) define KernelPackage/drm-lima SUBMENU:=$(VIDEO_MENU) TITLE:=Mali-4xx GPU support - DEPENDS:=@(TARGET_rockchip||TARGET_sunxi) +kmod-drm +KERNEL_6_1:kmod-drm-gem-shmem-helper + DEPENDS:=@(TARGET_rockchip||TARGET_sunxi) +kmod-drm +!LINUX_5_15:kmod-drm-gem-shmem-helper KCONFIG:= \ CONFIG_DRM_VGEM \ CONFIG_DRM_GEM_CMA_HELPER=y \ @@ -470,7 +470,7 @@ $(eval $(call KernelPackage,drm-lima)) define KernelPackage/drm-panfrost SUBMENU:=$(VIDEO_MENU) TITLE:=DRM support for ARM Mali Midgard/Bifrost GPUs - DEPENDS:=@(TARGET_rockchip||TARGET_sunxi) +kmod-drm +KERNEL_6_1:kmod-drm-gem-shmem-helper + DEPENDS:=@(TARGET_rockchip||TARGET_sunxi) +kmod-drm +!LINUX_5_15:kmod-drm-gem-shmem-helper KCONFIG:=CONFIG_DRM_PANFROST FILES:= \ $(LINUX_DIR)/drivers/gpu/drm/panfrost/panfrost.ko \ diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk index b43d9b7d16..f95c6c81c3 100644 --- a/target/linux/rockchip/modules.mk +++ b/target/linux/rockchip/modules.mk @@ -6,7 +6,7 @@ define KernelPackage/drm-rockchip SUBMENU:=$(VIDEO_MENU) TITLE:=Rockchip DRM support DEPENDS:=@TARGET_rockchip +kmod-backlight +kmod-drm-kms-helper \ - +kmod-multimedia-input +LINUX_6_1:kmod-drm-display-helper + +kmod-multimedia-input +!LINUX_5_15:kmod-drm-display-helper KCONFIG:= \ CONFIG_DRM_ROCKCHIP \ CONFIG_DRM_LOAD_EDID_FIRMWARE=y \