From 5c7400e932068234ab17f075c6abcfd03dfee415 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 15 Mar 2024 11:34:20 +0100 Subject: [PATCH] kernel: modules: video: drm: remove DRM_EXEC and DRM_SUBALLOC_HELPER As part of adding kernel 6.6 support, DRM_EXEC and DRM_SUBALLOC_HELPER were added to the kmod-drm, however these are only used by drm-amdgpu and drm-radeon which are only supported on x86. So, lets start fixing building of other targets by removing these from the main kmod-drm, in follow-up commits they will be packaged separately and selected when required. Fixes: 5b08b5600720 ("kernel: modules: video: adapt for kernel 6.6") Signed-off-by: Robert Marko --- package/kernel/linux/modules/video.mk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 45034ba3e8..1a4bf8ac77 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -246,15 +246,11 @@ define KernelPackage/drm HIDDEN:=1 DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight \ +kmod-fb - KCONFIG:=CONFIG_DRM \ - CONFIG_DRM_EXEC@ge6.6 \ - CONFIG_DRM_SUBALLOC_HELPER@ge6.4 + KCONFIG:=CONFIG_DRM FILES:= \ $(LINUX_DIR)/drivers/gpu/drm/drm.ko \ - $(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko \ - $(LINUX_DIR)/drivers/gpu/drm/drm_exec.ko@ge6.6 \ - $(LINUX_DIR)/drivers/gpu/drm/drm_suballoc_helper.ko@ge6.4 - AUTOLOAD:=$(call AutoLoad,05,drm_exec@ge6.6 drm_suballoc_helper@ge6.4 drm) + $(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko + AUTOLOAD:=$(call AutoLoad,05,drm) endef define KernelPackage/drm/description -- 2.30.2