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

kmod-drm-*: fixes depends on x86 with linux 6.1

Browse Source 
Fixes: #10721
This commit is contained in:
AmadeusGhost 2022-10-26 23:36:25 +08:00
parent 0744781758
commit fa691af892
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,26 @@ endef
$(eval $(call KernelPackage,backlight-pwm)) $(eval $(call KernelPackage,backlight-pwm))
define KernelPackage/acpi-video
SUBMENU:=$(VIDEO_MENU)
TITLE:=ACPI Extensions For Display Adapters
DEPENDS:=@TARGET_x86 +kmod-backlight
HIDDEN:=1
KCONFIG:= \
CONFIG_ACPI_WMI \
CONFIG_ACPI_VIDEO
FILES:=$(LINUX_DIR)/drivers/acpi/video.ko \
$(LINUX_DIR)/drivers/platform/x86/wmi.ko
AUTOLOAD:=$(call AutoProbe,wmi video)
endef
define KernelPackage/acpi-video/description
Kernel support for integrated graphics devices
endef
$(eval $(call KernelPackage,acpi-video))
define KernelPackage/fb define KernelPackage/fb
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=Framebuffer and framebuffer console support TITLE:=Framebuffer and framebuffer console support
@ -243,14 +263,13 @@ define KernelPackage/drm
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=Direct Rendering Manager (DRM) support TITLE:=Direct Rendering Manager (DRM) support
HIDDEN:=1 HIDDEN:=1
DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +kmod-backlight \ DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-backlight \
+(LINUX_5_15||LINUX_6_1):kmod-fb +(LINUX_5_15||LINUX_6_1):kmod-fb
KCONFIG:= \ KCONFIG:= \
CONFIG_DRM \ CONFIG_DRM \
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y \
CONFIG_DRM_FBDEV_EMULATION=y \ CONFIG_DRM_FBDEV_EMULATION=y \
CONFIG_DRM_FBDEV_OVERALLOC=100 \ CONFIG_DRM_FBDEV_OVERALLOC=100 \
CONFIG_HDMI CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/gpu/drm/drm.ko \ $(LINUX_DIR)/drivers/gpu/drm/drm.ko \
$(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko $(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko
@ -328,7 +347,7 @@ define KernelPackage/drm-amdgpu
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 \ +kmod-drm-kms-helper +kmod-i2c-algo-bit +amdgpu-firmware \
+LINUX_6_1:kmod-drm-display-helper +LINUX_6_1:kmod-drm-display-helper +LINUX_6_1:kmod-acpi-video
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 \
@ -423,7 +442,7 @@ define KernelPackage/drm-radeon
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=Radeon DRM support TITLE:=Radeon DRM support
DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-kms-helper \ DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-kms-helper \
+kmod-drm-ttm +kmod-i2c-algo-bit +radeon-firmware +kmod-drm-ttm +kmod-i2c-algo-bit +LINUX_6_1:kmod-acpi-video +radeon-firmware
KCONFIG:=CONFIG_DRM_RADEON KCONFIG:=CONFIG_DRM_RADEON
FILES:=$(LINUX_DIR)/drivers/gpu/drm/radeon/radeon.ko FILES:=$(LINUX_DIR)/drivers/gpu/drm/radeon/radeon.ko
AUTOLOAD:=$(call AutoProbe,radeon) AUTOLOAD:=$(call AutoProbe,radeon)
@ -438,15 +457,13 @@ $(eval $(call KernelPackage,drm-radeon))
define KernelPackage/drm-nouveau define KernelPackage/drm-nouveau
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=nouveau DRM support TITLE:=nouveau DRM support
DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-drm-kms-helper DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-drm-kms-helper +LINUX_6_1:kmod-acpi-video
KCONFIG:=CONFIG_DRM_NOUVEAU \ KCONFIG:=CONFIG_DRM_NOUVEAU \
NOUVEAU_DEBUG=5 \ NOUVEAU_DEBUG=5 \
NOUVEAU_DEBUG_DEFAULT=3 \ NOUVEAU_DEBUG_DEFAULT=3 \
NOUVEAU_DEBUG_MMU=n \ NOUVEAU_DEBUG_MMU=n \
DRM_NOUVEAU_BACKLIGHT=y DRM_NOUVEAU_BACKLIGHT=y
FILES:=\ FILES:=$(LINUX_DIR)/drivers/gpu/drm/nouveau/nouveau.ko
$(LINUX_DIR)/drivers/gpu/drm/nouveau/nouveau.ko \
$(LINUX_DIR)/drivers/platform/x86/wmi.ko
AUTOLOAD:=$(call AutoProbe,nouveau) AUTOLOAD:=$(call AutoProbe,nouveau)
endef endef
@ -1103,7 +1120,7 @@ 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 \ DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware \
+LINUX_6_1:kmod-drm-display-helper +LINUX_6_1:kmod-drm-display-helper +LINUX_6_1:kmod-acpi-video
KCONFIG:= \ KCONFIG:= \
CONFIG_INTEL_GTT \ CONFIG_INTEL_GTT \
CONFIG_DRM_I915 \ CONFIG_DRM_I915 \