mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
Merge pull request #8228 from heitbaum/kernel65
[le12] linux: update to 6.5.8
This commit is contained in:
commit
b7b5cdfe49
@ -29,8 +29,8 @@ case "${LINUX}" in
|
|||||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="6.5.3"
|
PKG_VERSION="6.5.8"
|
||||||
PKG_SHA256="4cac13f7b17bd8dcf9032ad68f9123ab5313d698c9f59416043165150763eb4f"
|
PKG_SHA256="299cca897d90deaa176eebec42f0a80eeb7516afed330a45c14da9de086cf717"
|
||||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||||
PKG_PATCH_DIRS="default"
|
PKG_PATCH_DIRS="default"
|
||||||
;;
|
;;
|
||||||
|
@ -1,57 +0,0 @@
|
|||||||
From 5e4400b24fc1f8ad41bccb6a6bdb54b961526556 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Matthias Reichl <hias@horus.com>
|
|
||||||
Date: Thu, 7 Sep 2023 20:33:25 +0200
|
|
||||||
Subject: [PATCH] ASoC: hdmi-codec: Fix broken channel map reporting
|
|
||||||
|
|
||||||
Commit 4e0871333661 ("ASoC: hdmi-codec: fix channel info for
|
|
||||||
compressed formats") accidentally changed hcp->chmap_idx from
|
|
||||||
ca_id, the CEA channel allocation ID, to idx, the index to
|
|
||||||
the table of channel mappings ordered by preference.
|
|
||||||
|
|
||||||
This resulted in wrong channel maps being reported to userspace,
|
|
||||||
eg for 5.1 "FL,FR,LFE,FC" was reported instead of the expected
|
|
||||||
"FL,FR,LFE,FC,RL,RR":
|
|
||||||
|
|
||||||
~ # speaker-test -c 6 -t sine
|
|
||||||
...
|
|
||||||
0 - Front Left
|
|
||||||
3 - Front Center
|
|
||||||
1 - Front Right
|
|
||||||
2 - LFE
|
|
||||||
4 - Unknown
|
|
||||||
5 - Unknown
|
|
||||||
|
|
||||||
~ # amixer cget iface=PCM,name='Playback Channel Map' | grep ': values'
|
|
||||||
: values=3,4,8,7,0,0,0,0
|
|
||||||
|
|
||||||
Switch this back to ca_id in case of PCM audio so the correct channel
|
|
||||||
map is reported again and set it to HDMI_CODEC_CHMAP_IDX_UNKNOWN in
|
|
||||||
case of non-PCM audio so the PCM channel map control returns "Unknown"
|
|
||||||
channels (value 0).
|
|
||||||
|
|
||||||
Fixes: 4e0871333661 ("ASoC: hdmi-codec: fix channel info for compressed formats")
|
|
||||||
Cc: stable@vger.kernel.org
|
|
||||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
|
||||||
---
|
|
||||||
sound/soc/codecs/hdmi-codec.c | 5 ++++-
|
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
|
|
||||||
index 13689e718d36f..09eef6042aad6 100644
|
|
||||||
--- a/sound/soc/codecs/hdmi-codec.c
|
|
||||||
+++ b/sound/soc/codecs/hdmi-codec.c
|
|
||||||
@@ -531,7 +531,10 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai,
|
|
||||||
hp->sample_rate = sample_rate;
|
|
||||||
hp->channels = channels;
|
|
||||||
|
|
||||||
- hcp->chmap_idx = idx;
|
|
||||||
+ if (pcm_audio)
|
|
||||||
+ hcp->chmap_idx = ca_id;
|
|
||||||
+ else
|
|
||||||
+ hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.39.2
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 6.5.3 Kernel Configuration
|
# Linux/arm64 6.5.8 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnu-gcc-13.2.0 (GCC) 13.2.0"
|
CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnu-gcc-13.2.0 (GCC) 13.2.0"
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
@ -370,6 +370,7 @@ CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
|
|||||||
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
||||||
|
# CONFIG_ARM64_ERRATUM_2966298 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 6.5.3 Kernel Configuration
|
# Linux/arm64 6.5.8 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnu-gcc-13.2.0 (GCC) 13.2.0"
|
CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnu-gcc-13.2.0 (GCC) 13.2.0"
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
@ -358,6 +358,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
|
|||||||
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
||||||
|
# CONFIG_ARM64_ERRATUM_2966298 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 6.5.3 Kernel Configuration
|
# Linux/arm64 6.5.8 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-13.2.0 (GCC) 13.2.0"
|
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-13.2.0 (GCC) 13.2.0"
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
@ -362,6 +362,7 @@ CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
|
|||||||
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
||||||
|
# CONFIG_ARM64_ERRATUM_2966298 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 6.5.3 Kernel Configuration
|
# Linux/arm64 6.5.8 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-13.2.0 (GCC) 13.2.0"
|
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-13.2.0 (GCC) 13.2.0"
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
@ -360,6 +360,7 @@ CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
|
|||||||
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
||||||
|
# CONFIG_ARM64_ERRATUM_2966298 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 6.5.3 Kernel Configuration
|
# Linux/arm64 6.5.8 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-13.2.0 (GCC) 13.2.0"
|
CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-13.2.0 (GCC) 13.2.0"
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
@ -360,6 +360,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
|
|||||||
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
# CONFIG_ARM64_ERRATUM_2067961 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
# CONFIG_ARM64_ERRATUM_2441009 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
# CONFIG_ARM64_ERRATUM_2645198 is not set
|
||||||
|
# CONFIG_ARM64_ERRATUM_2966298 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
||||||
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
# CONFIG_CAVIUM_ERRATUM_27456 is not set
|
||||||
|
Loading…
x
Reference in New Issue
Block a user