mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-03 07:57:49 +00:00
Merge pull request #6325 from heitbaum/kernel11
linux: update to 5.17.y
This commit is contained in:
commit
d020e61e27
@ -28,8 +28,8 @@ case "${LINUX}" in
|
||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="5.17"
|
||||
PKG_SHA256="555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1"
|
||||
PKG_VERSION="5.17.4"
|
||||
PKG_SHA256="6e3cd56ee83a9cb5ac3fde1442c40367ab67368946c4c93bbeb1c65664a0d3c5"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_PATCH_DIRS="default"
|
||||
;;
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 5.17.0-rc3 Kernel Configuration
|
||||
# Linux/arm64 5.17.1-rc1 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.3-2021.07 (arm-10.29)) 10.3.1 20210621"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -14,6 +14,7 @@ CONFIG_LLD_VERSION=0
|
||||
CONFIG_CC_CAN_LINK=y
|
||||
CONFIG_CC_CAN_LINK_STATIC=y
|
||||
CONFIG_CC_HAS_ASM_GOTO=y
|
||||
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
|
||||
CONFIG_CC_HAS_ASM_INLINE=y
|
||||
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
@ -408,7 +409,6 @@ CONFIG_HZ=250
|
||||
CONFIG_SCHED_HRTICK=y
|
||||
CONFIG_ARCH_SPARSEMEM_ENABLE=y
|
||||
CONFIG_HW_PERF_EVENTS=y
|
||||
CONFIG_ARCH_HAS_FILTER_PGPROT=y
|
||||
# CONFIG_PARAVIRT is not set
|
||||
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
|
||||
CONFIG_KEXEC=y
|
||||
@ -6736,7 +6736,6 @@ CONFIG_HAVE_ARCH_KGDB=y
|
||||
# CONFIG_KGDB is not set
|
||||
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
|
||||
# CONFIG_UBSAN is not set
|
||||
CONFIG_HAVE_KCSAN_COMPILER=y
|
||||
CONFIG_HAVE_ARCH_KCSAN=y
|
||||
CONFIG_HAVE_KCSAN_COMPILER=y
|
||||
# CONFIG_KCSAN is not set
|
||||
|
@ -1,33 +0,0 @@
|
||||
From 837c5a2d79984be3732751b1bfc6ec609ba82e2b Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||
Date: Fri, 28 Jan 2022 17:03:04 +0100
|
||||
Subject: [PATCH] media: hantro: sunxi: Fix VP9 steps
|
||||
|
||||
It turns out postproc for VP9 needs width and height to be multiple of
|
||||
32.
|
||||
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||
---
|
||||
drivers/staging/media/hantro/sunxi_vpu_hw.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/media/hantro/sunxi_vpu_hw.c b/drivers/staging/media/hantro/sunxi_vpu_hw.c
|
||||
index 90633406c4eb..c0edd5856a0c 100644
|
||||
--- a/drivers/staging/media/hantro/sunxi_vpu_hw.c
|
||||
+++ b/drivers/staging/media/hantro/sunxi_vpu_hw.c
|
||||
@@ -29,10 +29,10 @@ static const struct hantro_fmt sunxi_vpu_dec_fmts[] = {
|
||||
.frmsize = {
|
||||
.min_width = 48,
|
||||
.max_width = 3840,
|
||||
- .step_width = MB_DIM,
|
||||
+ .step_width = 32,
|
||||
.min_height = 48,
|
||||
.max_height = 2160,
|
||||
- .step_height = MB_DIM,
|
||||
+ .step_height = 32,
|
||||
},
|
||||
},
|
||||
};
|
||||
--
|
||||
2.35.0
|
||||
|
@ -1,34 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||
Date: Wed, 9 Feb 2022 19:03:06 +0100
|
||||
Subject: [PATCH] media: cedrus: Fix H265 aux buffer size
|
||||
|
||||
Neighbour info buffer size needs to be 794 kiB in size on H6. This is
|
||||
actually mentioned in comment, but smaller size is used nevertheless.
|
||||
|
||||
Increase buffer size to conform H6 needs. Since increase is not that big
|
||||
in absolute numbers, it doesn't make sense to complicate logic for older
|
||||
generations.
|
||||
|
||||
Bug was discovered using iommu, which reported access error when trying
|
||||
to play H265 video.
|
||||
|
||||
Fixes: 86caab29da78 ("media: cedrus: Add HEVC/H.265 decoding support")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||
---
|
||||
drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
|
||||
index dec519bc55d4..ef51ddf9d0d7 100644
|
||||
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
|
||||
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
|
||||
@@ -23,7 +23,7 @@
|
||||
* Subsequent BSP implementations seem to double the neighbor info buffer size
|
||||
* for the H6 SoC, which may be related to 10 bit H265 support.
|
||||
*/
|
||||
-#define CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE (397 * SZ_1K)
|
||||
+#define CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE (794 * SZ_1K)
|
||||
#define CEDRUS_H265_ENTRY_POINTS_BUF_SIZE (4 * SZ_1K)
|
||||
#define CEDRUS_H265_MV_COL_BUF_UNIT_CTB_SIZE 160
|
||||
|
@ -1,38 +0,0 @@
|
||||
From df20a1d7586c8986c986624ca8a9c322f524b515 Mon Sep 17 00:00:00 2001
|
||||
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||
Date: Mon, 14 Feb 2022 20:01:26 +0100
|
||||
Subject: [PATCH] media: cedrus: h264: Fix neighbour info buffer size
|
||||
|
||||
According to BSP library source, H264 neighbour info buffer size needs
|
||||
to be 32 kiB for H6. This is similar to H265 decoding, which also needs
|
||||
double buffer size in comparison to older Cedrus core generations.
|
||||
|
||||
Increase buffer size to cover H6 needs. Since increase is not that big
|
||||
in absolute numbers, it doesn't make sense to complicate logic for older
|
||||
generations.
|
||||
|
||||
Issue was discovered using iommu and cross checked with BSP library
|
||||
source.
|
||||
|
||||
Fixes: 6eb9b758e307 ("media: cedrus: Add H264 decoding support")
|
||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||
---
|
||||
drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
|
||||
index b4173a8926d6..d8fb93035470 100644
|
||||
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
|
||||
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
|
||||
@@ -38,7 +38,7 @@ struct cedrus_h264_sram_ref_pic {
|
||||
|
||||
#define CEDRUS_H264_FRAME_NUM 18
|
||||
|
||||
-#define CEDRUS_NEIGHBOR_INFO_BUF_SIZE (16 * SZ_1K)
|
||||
+#define CEDRUS_NEIGHBOR_INFO_BUF_SIZE (32 * SZ_1K)
|
||||
#define CEDRUS_MIN_PIC_INFO_BUF_SIZE (130 * SZ_1K)
|
||||
|
||||
static void cedrus_h264_write_sram(struct cedrus_dev *dev,
|
||||
--
|
||||
2.35.1
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.17.0-rc3 Kernel Configuration
|
||||
# Linux/arm 5.17.1-rc1 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="armv7a-libreelec-linux-gnueabihf-gcc-10.3.0 (GCC) 10.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -14,6 +14,7 @@ CONFIG_LLD_VERSION=0
|
||||
CONFIG_CC_CAN_LINK=y
|
||||
CONFIG_CC_CAN_LINK_STATIC=y
|
||||
CONFIG_CC_HAS_ASM_GOTO=y
|
||||
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
|
||||
CONFIG_CC_HAS_ASM_INLINE=y
|
||||
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
@ -1685,7 +1686,7 @@ CONFIG_NET_DSA_MV88E6XXX_PTP=y
|
||||
# CONFIG_NET_DSA_XRS700X_I2C is not set
|
||||
# CONFIG_NET_DSA_XRS700X_MDIO is not set
|
||||
# CONFIG_NET_DSA_QCA8K is not set
|
||||
# CONFIG_NET_DSA_REALTEK_SMI is not set
|
||||
# CONFIG_NET_DSA_REALTEK is not set
|
||||
# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
|
||||
# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
|
||||
# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
|
||||
|
@ -1124,10 +1124,10 @@ index 000000000000..da40f62617ef
|
||||
+ }
|
||||
+
|
||||
+ /* Any defined maximum tmds clock limit we must not exceed*/
|
||||
+ if ((di->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_36) &&
|
||||
+ if ((di->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_36) &&
|
||||
+ (mode->clock * 3 / 2 <= di->max_tmds_clock))
|
||||
+ video->color_depth = 12;
|
||||
+ else if ((di->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_30) &&
|
||||
+ else if ((di->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30) &&
|
||||
+ (mode->clock * 5 / 4 <= di->max_tmds_clock))
|
||||
+ video->color_depth = 10;
|
||||
+
|
||||
|
@ -80,14 +80,14 @@ index 1e5130e295f7..2796252adf68 100644
|
||||
- }
|
||||
+ video->color_fmt = YCBCR_4_2_2;
|
||||
+
|
||||
+ if (!(di->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_36))
|
||||
+ if (!(di->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_36))
|
||||
+ return false;
|
||||
|
||||
- /* Any defined maximum tmds clock limit we must not exceed*/
|
||||
- if ((di->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_36) &&
|
||||
- if ((di->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_36) &&
|
||||
- (mode->clock * 3 / 2 <= di->max_tmds_clock))
|
||||
video->color_depth = 12;
|
||||
- else if ((di->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_30) &&
|
||||
- else if ((di->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30) &&
|
||||
- (mode->clock * 5 / 4 <= di->max_tmds_clock))
|
||||
- video->color_depth = 10;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.17.0-rc3 Kernel Configuration
|
||||
# Linux/arm 5.17.2-rc1 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-10.3.0 (GCC) 10.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -14,6 +14,7 @@ CONFIG_LLD_VERSION=0
|
||||
CONFIG_CC_CAN_LINK=y
|
||||
CONFIG_CC_CAN_LINK_STATIC=y
|
||||
CONFIG_CC_HAS_ASM_GOTO=y
|
||||
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
|
||||
CONFIG_CC_HAS_ASM_INLINE=y
|
||||
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
@ -1464,7 +1465,7 @@ CONFIG_NET_DSA_BCM_SF2=m
|
||||
# CONFIG_NET_DSA_XRS700X_I2C is not set
|
||||
# CONFIG_NET_DSA_XRS700X_MDIO is not set
|
||||
# CONFIG_NET_DSA_QCA8K is not set
|
||||
# CONFIG_NET_DSA_REALTEK_SMI is not set
|
||||
# CONFIG_NET_DSA_REALTEK is not set
|
||||
# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
|
||||
# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
|
||||
# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
|
||||
|
Loading…
x
Reference in New Issue
Block a user