diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index fcf50f009..55a3106b8 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -243,7 +243,8 @@ 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 +PACKAGE_kmod-backlight:kmod-backlight + DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +PACKAGE_kmod-backlight:kmod-backlight \ + +(LINUX_5_15):kmod-fb KCONFIG:= \ CONFIG_DRM \ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y \ diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk index 4ad49b57e..68380306c 100644 --- a/target/linux/rockchip/modules.mk +++ b/target/linux/rockchip/modules.mk @@ -11,8 +11,8 @@ define KernelPackage/drm-rockchip CONFIG_DRM_LOAD_EDID_FIRMWARE=y \ CONFIG_DRM_FBDEV_EMULATION=y \ CONFIG_DRM_FBDEV_OVERALLOC=100 \ - CONFIG_DRM_BRIDGE \ - CONFIG_HDMI \ + CONFIG_DRM_BRIDGE=y \ + CONFIG_HDMI=y \ CONFIG_PHY_ROCKCHIP_INNO_HDMI \ CONFIG_DRM_DW_HDMI \ CONFIG_DRM_DW_HDMI_CEC \ @@ -24,16 +24,17 @@ define KernelPackage/drm-rockchip CONFIG_ROCKCHIP_LVDS=y \ CONFIG_ROCKCHIP_RGB=n \ CONFIG_ROCKCHIP_RK3066_HDMI=n \ - CONFIG_DRM_PANEL \ - CONFIG_DRM_PANEL_BRIDGE \ + CONFIG_DRM_DP_AUX_BUS@ge5.15 \ + CONFIG_DRM_PANEL=y \ + CONFIG_DRM_PANEL_BRIDGE=y \ CONFIG_DRM_PANEL_SIMPLE FILES:= \ $(LINUX_DIR)/drivers/gpu/drm/bridge/synopsys/dw-hdmi.ko \ $(LINUX_DIR)/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.ko \ $(LINUX_DIR)/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.ko \ - $(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 \ $(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/panel/panel-simple.ko \ $(LINUX_DIR)/drivers/gpu/drm/rockchip/rockchipdrm.ko AUTOLOAD:=$(call AutoProbe,rockchipdrm phy-rockchip-inno-hdmi dw-hdmi-cec)