From 75eaacd7f03a7692bc999871b839fa31ecb8d3f2 Mon Sep 17 00:00:00 2001 From: DHDAXCW Date: Tue, 3 Jan 2023 12:34:03 +0000 Subject: [PATCH] fix --- package/kernel/linux/modules/video.mk | 4 +--- package/kernel/r8125/Makefile | 4 ++-- package/kernel/r8125/patches/021-6.1-suppot.patch | 14 -------------- target/linux/rockchip/modules.mk | 13 +++++++------ 4 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 package/kernel/r8125/patches/021-6.1-suppot.patch diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 7b63abc9a..a4e2c4304 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -28,9 +28,7 @@ define KernelPackage/backlight CONFIG_BACKLIGHT_ADP8870=n \ CONFIG_BACKLIGHT_OT200=n \ CONFIG_BACKLIGHT_PM8941_WLED=n - FILES:=$(LINUX_DIR)/drivers/video/backlight/backlight.ko \ - $(LINUX_DIR)/drivers/acpi/video.ko@ge6.1 \ - $(LINUX_DIR)/drivers/platform/x86/wmi.ko@ge6.1 + FILES:=$(LINUX_DIR)/drivers/video/backlight/backlight.ko AUTOLOAD:=$(call AutoProbe,video backlight) endef diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile index 19770596e..3c2112878 100644 --- a/package/kernel/r8125/Makefile +++ b/package/kernel/r8125/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=r8125 -PKG_VERSION:=9.010.01-1 +PKG_VERSION:=9.010.01-2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8125-dkms/tar.gz/$(PKG_VERSION)? -PKG_HASH:=81fb9a100e6cefb421557639b476fd03af61a99c55bc8fb03c6e396532bd0944 +PKG_HASH:=b3e1b36578ba92a775049535e7434a9fc46710a721846c3706aca3d265db8cb9 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-dkms-$(PKG_VERSION) PKG_LICENSE:=GPL-2.0-only diff --git a/package/kernel/r8125/patches/021-6.1-suppot.patch b/package/kernel/r8125/patches/021-6.1-suppot.patch deleted file mode 100644 index c460ce33b..000000000 --- a/package/kernel/r8125/patches/021-6.1-suppot.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/r8125.h -+++ b/src/r8125.h -@@ -633,7 +633,11 @@ - typedef struct napi_struct *napi_ptr; - typedef int napi_budget; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) -+#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(ndev, &priv->napi, function, weight) -+#else - #define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight) -+#endif - #define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget) - #define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr) - #define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev; diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk index db17ccf17..3fd87e4ed 100644 --- a/target/linux/rockchip/modules.mk +++ b/target/linux/rockchip/modules.mk @@ -6,7 +6,7 @@ define KernelPackage/drm-rockchip SUBMENU:=$(VIDEO_MENU) TITLE:=Rockchip DRM support DEPENDS:=@TARGET_rockchip +kmod-backlight +kmod-drm-kms-helper \ - +kmod-multimedia-input +LINUX_6_0:kmod-drm-display-helper + +kmod-multimedia-input +LINUX_6_1:kmod-drm-display-helper KCONFIG:= \ CONFIG_DRM_ROCKCHIP \ CONFIG_DRM_LOAD_EDID_FIRMWARE=y \ @@ -27,7 +27,8 @@ define KernelPackage/drm-rockchip CONFIG_ROCKCHIP_RK3066_HDMI=n \ CONFIG_ROCKCHIP_VOP=y \ CONFIG_ROCKCHIP_VOP2=y \ - CONFIG_DRM_GEM_CMA_HELPER \ + CONFIG_DRM_GEM_CMA_HELPER@lt6.1 \ + CONFIG_DRM_GEM_DMA_HELPER@ge6.1 \ CONFIG_DRM_PANEL=y \ CONFIG_DRM_PANEL_BRIDGE=y \ CONFIG_DRM_PANEL_SIMPLE @@ -35,12 +36,12 @@ define KernelPackage/drm-rockchip $(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/phy/rockchip/phy-rockchip-inno-hdmi.ko \ - $(LINUX_DIR)/drivers/gpu/drm/drm_cma_helper.ko@ge6.0 \ + $(LINUX_DIR)/drivers/gpu/drm/drm_dp_aux_bus.ko@lt5.19 \ + $(LINUX_DIR)/drivers/gpu/drm/drm_dma_helper.ko@ge6.1 \ $(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 \ + $(LINUX_DIR)/drivers/media/cec/core/cec.ko AUTOLOAD:=$(call AutoProbe,rockchipdrm phy-rockchip-inno-hdmi dw-hdmi-cec) endef