From 7dc4dc9cee341e8ba86acd82f5dd84b973408795 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Dec 2022 10:54:33 +0000 Subject: [PATCH 1/8] linux (Allwinner aarch64): update .config for 5.10.157-rc1 --- projects/Allwinner/linux/linux.aarch64.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/Allwinner/linux/linux.aarch64.conf b/projects/Allwinner/linux/linux.aarch64.conf index 6c25911d4b..3ccd482495 100644 --- a/projects/Allwinner/linux/linux.aarch64.conf +++ b/projects/Allwinner/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.152 Kernel Configuration +# Linux/arm64 5.10.157-rc1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103" CONFIG_CC_IS_GCC=y @@ -875,6 +875,7 @@ CONFIG_INET_ESP=y # CONFIG_INET_ESP_OFFLOAD is not set # CONFIG_INET_ESPINTCP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From 8e8e48b8e6631ec90f7d4dbf53d1b87353df5fde Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Dec 2022 10:54:33 +0000 Subject: [PATCH 2/8] linux (Allwinner arm): update .config for 5.10.157-rc1 --- projects/Allwinner/linux/linux.arm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/Allwinner/linux/linux.arm.conf b/projects/Allwinner/linux/linux.arm.conf index 0e20c0aa30..6a98c9b927 100644 --- a/projects/Allwinner/linux/linux.arm.conf +++ b/projects/Allwinner/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.143-rc1 Kernel Configuration +# Linux/arm 5.10.157-rc1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-10.2.0 (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -858,6 +858,7 @@ CONFIG_INET_ESP=m # CONFIG_INET_ESP_OFFLOAD is not set # CONFIG_INET_ESPINTCP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=y # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set From df51b33d10cf55d3ed2d0ab50a22651f99c6ee0f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Dec 2022 10:54:33 +0000 Subject: [PATCH 3/8] linux (Generic): update .config for 5.10.157-rc1 --- projects/Generic/linux/linux.x86_64.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index e5e46306f4..67ebe44b37 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.143-rc1 Kernel Configuration +# Linux/x86 5.10.157-rc1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="x86_64-libreelec-linux-gnu-gcc-10.2.0 (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -974,6 +974,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=m # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y From e3637c9c04102e8eac5a783d78d598bcca321b2c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Dec 2022 10:54:34 +0000 Subject: [PATCH 4/8] linux (Rockchip RK3288): update .config for 5.10.157-rc1 --- projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf index 00c9842ecc..67009a5199 100644 --- a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf +++ b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.143-rc1 Kernel Configuration +# Linux/arm 5.10.157-rc1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-10.2.0 (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -862,6 +862,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From 1348362fe34334f7f9ddee3b95f2ba8330f7a484 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Dec 2022 10:54:34 +0000 Subject: [PATCH 5/8] linux (Rockchip RK3328): update .config for 5.10.157-rc1 --- .../Rockchip/devices/RK3328/linux/default/linux.aarch64.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf index 1d5556b866..4d4caf7817 100644 --- a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.152 Kernel Configuration +# Linux/arm64 5.10.157-rc1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103" CONFIG_CC_IS_GCC=y @@ -924,6 +924,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From de9d3a1c39103c3be7c6cda73034c91249ab5c01 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Dec 2022 10:54:34 +0000 Subject: [PATCH 6/8] linux (Rockchip RK3399): update .config for 5.10.157-rc1 --- .../Rockchip/devices/RK3399/linux/default/linux.aarch64.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index 550eace412..a8c24d7756 100644 --- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.152 Kernel Configuration +# Linux/arm64 5.10.157-rc1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103" CONFIG_CC_IS_GCC=y @@ -924,6 +924,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From 1c500f2f17aaeef4bb11acd01da1f87d26d3d176 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 12 Dec 2022 05:02:16 +0000 Subject: [PATCH 7/8] linux (Rockchip): rebase patches for 5.10.159 updated based on: - drm: bridge: dw_hdmi: fix preference of RGB modes over YUV420 - https://github.com/torvalds/linux/commit/d3d6b1bf85aefe0ebc0624574b3bb62f0693914c --- .../linux/default/linux-1000-drm-rockchip.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch index 954b86630a..507828750b 100644 --- a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch +++ b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch @@ -2146,6 +2146,11 @@ index ab2a97574fa7..b382fc2f8156 100644 @@ -2620,40 +2632,51 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, */ + /* Default 8bit RGB fallback */ +- output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; ++ if (is_tmds_allowed(info, mode, MEDIA_BUS_FMT_RGB888_1X24)) ++ output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; + if (max_bpc >= 16 && info->bpc == 16) { - if (info->color_formats & DRM_COLOR_FORMAT_YCRCB444) + if ((info->color_formats & DRM_COLOR_FORMAT_YCRCB444) && @@ -2199,11 +2204,6 @@ index ab2a97574fa7..b382fc2f8156 100644 + is_tmds_allowed(info, mode, MEDIA_BUS_FMT_YUV8_1X24)) output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24; - /* Default 8bit RGB fallback */ -- output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; -+ if (is_tmds_allowed(info, mode, MEDIA_BUS_FMT_RGB888_1X24)) -+ output_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; - *num_output_fmts = i; @@ -2833,11 +2856,20 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge, From 5f07c2bd3f73de4fbba08b8d580b13bc95cfdd80 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 3 Dec 2022 01:15:09 +0000 Subject: [PATCH 8/8] linux: update to 5.10.161 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 04d69b405d..e78810eed2 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -28,8 +28,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="5.10.156" - PKG_SHA256="679e9964ca720027967391b61db990ceb7868e93e203f87724f18310f4955923" + PKG_VERSION="5.10.161" + PKG_SHA256="7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;;