From: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Fri, 9 May 2025 06:46:18 +0000 (+0200)
Subject: bcm27xx: fix kmod-drm-rp1 modules dependencies
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ffbef7e19ff2f573ed0c94282f39e694a7466e9;p=thirdparty%2Fopenwrt.git

bcm27xx: fix kmod-drm-rp1 modules dependencies

kmod-drm-rp1-dsi, kmod-drm-rp1-dpi and kmod-drm-rp1-vec should depend on
kmod-drm-dma-helper and kmod-drm-vram-helper in order to fix dependency errors
when all kernel modules are selected.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/target/linux/bcm27xx/modules/video.mk b/target/linux/bcm27xx/modules/video.mk
index e8a61f138cc..05808d37d5a 100644
--- a/target/linux/bcm27xx/modules/video.mk
+++ b/target/linux/bcm27xx/modules/video.mk
@@ -141,17 +141,13 @@ define KernelPackage/drm-rp1-dsi
   TITLE:=RP1 Display Serial Interface for Video
   KCONFIG:= \
     CONFIG_DRM_RP1_DSI \
-    CONFIG_DRM_GEM_DMA_HELPER \
-    CONFIG_DRM_KMS_HELPER \
     CONFIG_DRM_MIPI_DSI=y \
-    CONFIG_DRM_VRAM_HELPER=n \
-    CONFIG_DRM_TTM=n \
-    CONFIG_DRM_TTM_HELPER=n \
     CONFIG_GENERIC_PHY_MIPI_DPHY=n \
     CONFIG_DRM_WERROR=n
   FILES:=$(LINUX_DIR)/drivers/gpu/drm/rp1/rp1-dsi/drm-rp1-dsi.ko
   AUTOLOAD:=$(call AutoLoad,67,drm-rp1-dsi)
-  DEPENDS:=@TARGET_bcm27xx_bcm2712 +kmod-drm-vc4
+  DEPENDS:=@TARGET_bcm27xx_bcm2712 +kmod-drm-vc4 \
+    +kmod-drm-dma-helper +kmod-drm-vram-helper
 endef
 
 define KernelPackage/drm-rp1-dsi/description
@@ -167,15 +163,12 @@ define KernelPackage/drm-rp1-dpi
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=RP1 Display Parallel Interface for Video
   KCONFIG:= \
-    CONFIG_DRM_RP1_DPI \
-    CONFIG_DRM_GEM_DMA_HELPER \
-    CONFIG_DRM_KMS_HELPER \
-    CONFIG_DRM_VRAM_HELPER=n \
-    CONFIG_DRM_TTM=n \
-    CONFIG_DRM_TTM_HELPER=n
+    CONFIG_DRM_RP1_DPI
   FILES:=$(LINUX_DIR)/drivers/gpu/drm/rp1/rp1-dpi/drm-rp1-dpi.ko
   AUTOLOAD:=$(call AutoLoad,67,drm-rp1-dpi)
-  DEPENDS:=@TARGET_bcm27xx_bcm2712 +kmod-drm-vc4 +kmod-rp1-pio
+  DEPENDS:=@TARGET_bcm27xx_bcm2712 +kmod-drm-vc4 \
+    +kmod-drm-dma-helper +kmod-drm-vram-helper \
+    +kmod-rp1-pio
 endef
 
 define KernelPackage/drm-rp1-dpi/description
@@ -193,15 +186,11 @@ define KernelPackage/drm-rp1-vec
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=RP1 Display Composite Video
   KCONFIG:= \
-    CONFIG_DRM_RP1_VEC \
-    CONFIG_DRM_GEM_DMA_HELPER \
-    CONFIG_DRM_KMS_HELPER \
-    CONFIG_DRM_VRAM_HELPER=n \
-    CONFIG_DRM_TTM=n \
-    CONFIG_DRM_TTM_HELPER=n
+    CONFIG_DRM_RP1_VEC
   FILES:=$(LINUX_DIR)/drivers/gpu/drm/rp1/rp1-vec/drm-rp1-vec.ko
   AUTOLOAD:=$(call AutoLoad,67,drm-rp1-vec)
-  DEPENDS:=@TARGET_bcm27xx_bcm2712 +kmod-drm-vc4
+  DEPENDS:=@TARGET_bcm27xx_bcm2712 +kmod-drm-vc4 \
+    +kmod-drm-dma-helper +kmod-drm-vram-helper
 endef
 
 define KernelPackage/drm-rp1-vec/description