Skip to content

Commit

Permalink
kmod-drm-*: fixes depends on x86 with linux 6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
aiamadeus committed Jan 4, 2023
1 parent 0744781 commit fa691af
Showing 1 changed file with 28 additions and 11 deletions.
39 changes: 28 additions & 11 deletions package/kernel/linux/modules/video.mk
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,26 @@ endef
$(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
SUBMENU:=$(VIDEO_MENU)
TITLE:=Framebuffer and framebuffer console support
Expand Down Expand Up @@ -243,14 +263,13 @@ define KernelPackage/drm
SUBMENU:=$(VIDEO_MENU)
TITLE:=Direct Rendering Manager (DRM) support
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
KCONFIG:= \
CONFIG_DRM \
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y \
CONFIG_DRM \
CONFIG_DRM_FBDEV_EMULATION=y \
CONFIG_DRM_FBDEV_OVERALLOC=100 \
CONFIG_HDMI
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
FILES:= \
$(LINUX_DIR)/drivers/gpu/drm/drm.ko \
$(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko
Expand Down Expand Up @@ -328,7 +347,7 @@ define KernelPackage/drm-amdgpu
TITLE:=AMDGPU DRM support
DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-ttm \
+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 \
CONFIG_DRM_AMDGPU_SI=y \
CONFIG_DRM_AMDGPU_CIK=y \
Expand Down Expand Up @@ -423,7 +442,7 @@ define KernelPackage/drm-radeon
SUBMENU:=$(VIDEO_MENU)
TITLE:=Radeon DRM support
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
FILES:=$(LINUX_DIR)/drivers/gpu/drm/radeon/radeon.ko
AUTOLOAD:=$(call AutoProbe,radeon)
Expand All @@ -438,15 +457,13 @@ $(eval $(call KernelPackage,drm-radeon))
define KernelPackage/drm-nouveau
SUBMENU:=$(VIDEO_MENU)
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 \
NOUVEAU_DEBUG=5 \
NOUVEAU_DEBUG_DEFAULT=3 \
NOUVEAU_DEBUG_MMU=n \
DRM_NOUVEAU_BACKLIGHT=y
FILES:=\
$(LINUX_DIR)/drivers/gpu/drm/nouveau/nouveau.ko \
$(LINUX_DIR)/drivers/platform/x86/wmi.ko
FILES:=$(LINUX_DIR)/drivers/gpu/drm/nouveau/nouveau.ko
AUTOLOAD:=$(call AutoProbe,nouveau)
endef

Expand Down Expand Up @@ -1103,7 +1120,7 @@ define KernelPackage/drm-i915
SUBMENU:=$(VIDEO_MENU)
TITLE:=Intel GPU drm support
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:= \
CONFIG_INTEL_GTT \
CONFIG_DRM_I915 \
Expand Down

0 comments on commit fa691af

Please sign in to comment.