298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: fixes drm module dependencies

Browse Source
This commit is contained in:
AmadeusGhost 2022-10-13 23:18:40 +08:00
parent 7ff615dafc
commit b98efa18fd
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/kernel/linux/modules/video.mk
View File

@ -263,6 +263,17 @@ endef
$(eval $(call KernelPackage,drm)) $(eval $(call KernelPackage,drm))
define KernelPackage/drm-buddy
SUBMENU:=$(VIDEO_MENU)
TITLE:=A page based buddy allocator
DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-drm @(LINUX_5_19||LINUX_6_0)
KCONFIG:=CONFIG_DRM_BUDDY
FILES:= $(LINUX_DIR)/drivers/gpu/drm/drm_buddy.ko
AUTOLOAD:=$(call AutoProbe,drm_buddy)
endef
$(eval $(call KernelPackage,drm-buddy))
define KernelPackage/drm-ttm define KernelPackage/drm-ttm
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=GPU memory management subsystem TITLE:=GPU memory management subsystem
@ -300,12 +311,9 @@ $(eval $(call KernelPackage,drm-kms-helper))
define KernelPackage/drm-display-helper define KernelPackage/drm-display-helper
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=DRM helpers for display adapters drivers TITLE:=DRM helpers for display adapters drivers
DEPENDS:=@DISPLAY_SUPPORT +kmod-drm @(LINUX_5_19||LINUX_6_0) DEPENDS:=@DISPLAY_SUPPORT +kmod-drm +TARGET_x86:kmod-drm-buddy @(LINUX_5_19||LINUX_6_0)
KCONFIG:= \ KCONFIG:=CONFIG_DRM_DISPLAY_HELPER
CONFIG_DRM_DISPLAY_HELPER \ FILES:=$(LINUX_DIR)/drivers/gpu/drm/display/drm_display_helper.ko
CONFIG_DRM_BUDDY
FILES:=$(LINUX_DIR)/drivers/gpu/drm/display/drm_display_helper.ko \
$(LINUX_DIR)/drivers/gpu/drm/drm_buddy.ko
AUTOLOAD:=$(call AutoProbe,drm_display_helper) AUTOLOAD:=$(call AutoProbe,drm_display_helper)
endef endef
@ -319,7 +327,8 @@ define KernelPackage/drm-amdgpu
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=AMDGPU DRM support TITLE:=AMDGPU DRM support
DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-ttm \ DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-ttm \
+kmod-drm-kms-helper +kmod-i2c-algo-bit +amdgpu-firmware +(LINUX_5_19||LINUX_6_0):kmod-drm-display-helper +kmod-drm-kms-helper +kmod-i2c-algo-bit +amdgpu-firmware \
+(LINUX_5_19||LINUX_6_0):kmod-drm-display-helper
KCONFIG:=CONFIG_DRM_AMDGPU \ KCONFIG:=CONFIG_DRM_AMDGPU \
CONFIG_DRM_AMDGPU_SI=y \ CONFIG_DRM_AMDGPU_SI=y \
CONFIG_DRM_AMDGPU_CIK=y \ CONFIG_DRM_AMDGPU_CIK=y \
@ -1093,7 +1102,8 @@ $(eval $(call KernelPackage,video-gspca-konica))
define KernelPackage/drm-i915 define KernelPackage/drm-i915
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=Intel GPU drm support TITLE:=Intel GPU drm support
DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware +(LINUX_5_19||LINUX_6_0):kmod-drm-display-helper DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware \
+(LINUX_5_19||LINUX_6_0):kmod-drm-display-helper
KCONFIG:= \ KCONFIG:= \
CONFIG_INTEL_GTT \ CONFIG_INTEL_GTT \
CONFIG_DRM_I915 \ CONFIG_DRM_I915 \

11
target/linux/rockchip/modules.mk
View File

@ -5,7 +5,8 @@
define KernelPackage/drm-rockchip define KernelPackage/drm-rockchip
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=Rockchip DRM support 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_6_0:kmod-drm-display-helper
KCONFIG:= \ KCONFIG:= \
CONFIG_DRM_ROCKCHIP \ CONFIG_DRM_ROCKCHIP \
CONFIG_DRM_LOAD_EDID_FIRMWARE=y \ CONFIG_DRM_LOAD_EDID_FIRMWARE=y \
@ -19,12 +20,14 @@ define KernelPackage/drm-rockchip
CONFIG_ROCKCHIP_ANALOGIX_DP=n \ CONFIG_ROCKCHIP_ANALOGIX_DP=n \
CONFIG_ROCKCHIP_CDN_DP=n \ CONFIG_ROCKCHIP_CDN_DP=n \
CONFIG_ROCKCHIP_DW_HDMI=y \ CONFIG_ROCKCHIP_DW_HDMI=y \
CONFIG_ROCKCHIP_INNO_HDMI=y \
CONFIG_ROCKCHIP_DW_MIPI_DSI=y \ CONFIG_ROCKCHIP_DW_MIPI_DSI=y \
CONFIG_ROCKCHIP_INNO_HDMI=y \
CONFIG_ROCKCHIP_LVDS=y \ CONFIG_ROCKCHIP_LVDS=y \
CONFIG_ROCKCHIP_RGB=n \ CONFIG_ROCKCHIP_RGB=n \
CONFIG_ROCKCHIP_RK3066_HDMI=n \ CONFIG_ROCKCHIP_RK3066_HDMI=n \
CONFIG_DRM_DP_AUX_BUS@ge5.15 \ CONFIG_ROCKCHIP_VOP=y \
CONFIG_ROCKCHIP_VOP2=y \
CONFIG_DRM_GEM_CMA_HELPER \
CONFIG_DRM_PANEL=y \ CONFIG_DRM_PANEL=y \
CONFIG_DRM_PANEL_BRIDGE=y \ CONFIG_DRM_PANEL_BRIDGE=y \
CONFIG_DRM_PANEL_SIMPLE CONFIG_DRM_PANEL_SIMPLE
@ -35,7 +38,7 @@ define KernelPackage/drm-rockchip
$(LINUX_DIR)/drivers/media/cec/cec.ko@lt5.10 \ $(LINUX_DIR)/drivers/media/cec/cec.ko@lt5.10 \
$(LINUX_DIR)/drivers/media/cec/core/cec.ko@ge5.10 \ $(LINUX_DIR)/drivers/media/cec/core/cec.ko@ge5.10 \
$(LINUX_DIR)/drivers/phy/rockchip/phy-rockchip-inno-hdmi.ko \ $(LINUX_DIR)/drivers/phy/rockchip/phy-rockchip-inno-hdmi.ko \
$(LINUX_DIR)/drivers/gpu/drm/drm_dp_aux_bus.ko@ge5.15 \ $(LINUX_DIR)/drivers/gpu/drm/drm_cma_helper.ko@ge6.0 \
$(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko \ $(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
AUTOLOAD:=$(call AutoProbe,rockchipdrm phy-rockchip-inno-hdmi dw-hdmi-cec) AUTOLOAD:=$(call AutoProbe,rockchipdrm phy-rockchip-inno-hdmi dw-hdmi-cec)