mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #8998 from chewitt/linux695
linux: bump Amlogic patchset to Linux 6.9.5
This commit is contained in:
Rudi Heitbaum
GitHub
commit
834eda7da2
@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}"
|
||||
|
||||
case "${LINUX}" in
|
||||
amlogic)
|
||||
PKG_VERSION="1b4861e32e461b6fae14dc49ed0f1c7f20af5146" # 6.9.3
|
||||
PKG_SHA256="2502f1858175fc03ba38198df6b7ac62e167c9d2ee9b08b157bff66c73130e2c"
|
||||
PKG_VERSION="380df7b7938d3c3ba1d0d0b472a810fd38061329" # 6.9.5
|
||||
PKG_SHA256="740368c264d071200577ef745c1e06362564daefd941c7c562905853c6f16598"
|
||||
PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||
PKG_PATCH_DIRS="default rtlwifi/6.10 rtlwifi/6.11"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 623a57187a4893a78bf818f7852b0c4e40936b30 Mon Sep 17 00:00:00 2001
|
||||
From 206700df130ec0f8d26200b06d654e43c50fef97 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Sat, 13 Apr 2019 05:41:51 +0000
|
||||
Subject: [PATCH 01/69] LOCAL: set meson-gx cma pool to 896MB
|
||||
Subject: [PATCH 01/52] LOCAL: set meson-gx cma pool to 896MB
|
||||
|
||||
This change sets the CMA pool to a larger 896MB! value for vdec use
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 927f228f7bff9640c8f848202401a24be426c8b7 Mon Sep 17 00:00:00 2001
|
||||
From f0e9bd4a8b251fbc622ce375f7e5d3d7f2216601 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Wed, 14 Aug 2019 19:58:14 +0000
|
||||
Subject: [PATCH 02/69] LOCAL: set meson-g12 cma pool to 896MB
|
||||
Subject: [PATCH 02/52] LOCAL: set meson-g12 cma pool to 896MB
|
||||
|
||||
This change sets the CMA pool to a larger 896MB! value for vdec use
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 1cb9ad61f678caced45a9b84f19e55fb97add9d1 Mon Sep 17 00:00:00 2001
|
||||
From 2f1610b87a7cf5dc0b03dce6306d340d40bfde43 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Sat, 13 Apr 2019 05:45:18 +0000
|
||||
Subject: [PATCH 03/69] LOCAL: arm64: fix Kodi sysinfo CPU information
|
||||
Subject: [PATCH 03/52] LOCAL: arm64: fix Kodi sysinfo CPU information
|
||||
|
||||
This allows the CPU information to show in the Kodi sysinfo screen, e.g.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From bd0e5a715d103bb88d73ae280655a849f7762ecc Mon Sep 17 00:00:00 2001
|
||||
From 5f037501721e9a3be26d3ee1ae703967c40d5cea Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Thu, 3 Nov 2016 15:29:23 +0100
|
||||
Subject: [PATCH 04/69] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
|
||||
Subject: [PATCH 04/52] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
|
||||
|
||||
The Amlogic Meson GX SoCs uses a non-standard argument to the
|
||||
PSCI CPU_SUSPEND call to enter system suspend.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 2e207659c996f765749e32d3ff932ab673965b42 Mon Sep 17 00:00:00 2001
|
||||
From 50299761b13374df2c3b9c48fb1658b80787cb56 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Thu, 3 Nov 2016 15:29:25 +0100
|
||||
Subject: [PATCH 05/69] LOCAL: arm64: dts: meson: add support for GX PM and
|
||||
Subject: [PATCH 05/52] LOCAL: arm64: dts: meson: add support for GX PM and
|
||||
Virtual RTC
|
||||
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 4c9bfede767b2c1e1ff43eda7fbb2b9b7d938761 Mon Sep 17 00:00:00 2001
|
||||
From c7a09826dd87ac6276723b795d07b1d7b3402003 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Thu, 21 Jan 2021 01:35:36 +0000
|
||||
Subject: [PATCH 06/69] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
|
||||
Subject: [PATCH 06/52] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
|
||||
Khadas VIM
|
||||
|
||||
Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 36f210099326720a267df7108ef0ea7fb9ae88a7 Mon Sep 17 00:00:00 2001
|
||||
From 650ba8c1646070e57055820228e28869f298f043 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Sat, 6 Nov 2021 13:01:08 +0000
|
||||
Subject: [PATCH 07/69] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
|
||||
Subject: [PATCH 07/52] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
|
||||
Khadas VIM2
|
||||
|
||||
Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 2ca029008c662f81a80a7e694229d1950efe0d9a Mon Sep 17 00:00:00 2001
|
||||
From 1dd902597bf4f23cb22ca21592d7dd5bbc055c3d Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Mon, 1 Feb 2021 19:27:40 +0000
|
||||
Subject: [PATCH 08/69] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix
|
||||
Subject: [PATCH 08/52] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix
|
||||
NEO U9-H
|
||||
|
||||
Add node aliases to prevent meson-vrtc from claiming /dev/rtc0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 465c8694439773f00bc9088e41354e6d348366ab Mon Sep 17 00:00:00 2001
|
||||
From 57075cf3c64b7d8a5466a86acd2275ededdbb382 Mon Sep 17 00:00:00 2001
|
||||
From: Anssi Hannula <anssi.hannula@iki.fi>
|
||||
Date: Sun, 17 Apr 2022 04:37:48 +0000
|
||||
Subject: [PATCH 09/69] LOCAL: ASoC: meson: assign internal PCM
|
||||
Subject: [PATCH 09/52] LOCAL: ASoC: meson: assign internal PCM
|
||||
chmap/ELD/IEC958 kctls to device 0
|
||||
|
||||
On SoC sound devices utilizing codec2codec DAI links with an HDMI codec the kctls
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 1bdbf76d2a7e0c715469d3bc67f71f8c41c323f1 Mon Sep 17 00:00:00 2001
|
||||
From 9bc892b8d6af3441bbc7129818b370555830afff Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Thu, 5 Jan 2023 15:16:46 +0000
|
||||
Subject: [PATCH 10/69] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware
|
||||
Subject: [PATCH 10/52] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware
|
||||
decoding
|
||||
|
||||
The MPEG1/2 decoder is broken and nobody has volunteered to poke
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From e72bd54794e45ae480928111c53b03f178d81998 Mon Sep 17 00:00:00 2001
|
||||
From b8bcc5874a5db72ac67f2db4f23b4c467d41f809 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
|
||||
Date: Sun, 20 Feb 2022 08:23:12 +0000
|
||||
Subject: [PATCH 30/69] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
|
||||
Subject: [PATCH 11/52] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
|
||||
Micro Electronics
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -1,7 +1,7 @@
|
||||
From 1dd793f369319025118ca526d0fc899cc78eaeae Mon Sep 17 00:00:00 2001
|
||||
From ec4c674f72dc4f18f83ed75c8d2ed973792c2572 Mon Sep 17 00:00:00 2001
|
||||
From: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
Date: Sun, 20 Feb 2022 08:24:47 +0000
|
||||
Subject: [PATCH 31/69] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro
|
||||
Subject: [PATCH 12/52] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro
|
||||
Electronics TM1628
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -1,7 +1,7 @@
|
||||
From 77408aa188572b17c585b3f8a2074e2dad8ad2ed Mon Sep 17 00:00:00 2001
|
||||
From 3351eebeeffaa70b7738b78494156ceae8217993 Mon Sep 17 00:00:00 2001
|
||||
From: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
Date: Sun, 20 Feb 2022 08:26:27 +0000
|
||||
Subject: [PATCH 32/69] FROMLIST(v5): docs: ABI: document tm1628 attribute
|
||||
Subject: [PATCH 13/52] FROMLIST(v5): docs: ABI: document tm1628 attribute
|
||||
display-text
|
||||
|
||||
Document the attribute for reading / writing the text to be displayed on
|
||||
@ -1,7 +1,7 @@
|
||||
From 41fa0e4796e981b1874233c36af38583a2f9d07d Mon Sep 17 00:00:00 2001
|
||||
From 7dacf519d956d0b5892fd539891fc0f92111b95a Mon Sep 17 00:00:00 2001
|
||||
From: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
Date: Mon, 4 Apr 2022 18:51:20 +0000
|
||||
Subject: [PATCH 33/69] FROMLIST(v5): auxdisplay: add support for Titanmec
|
||||
Subject: [PATCH 14/52] FROMLIST(v5): auxdisplay: add support for Titanmec
|
||||
TM1628 7 segment display controller
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -1,7 +1,7 @@
|
||||
From c248e93fb876f2131e823757aacb6770a4bb9a57 Mon Sep 17 00:00:00 2001
|
||||
From 626fb337c8e9ff57ef8e27c9328a79848ab49f5e Mon Sep 17 00:00:00 2001
|
||||
From: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
Date: Mon, 4 Apr 2022 18:52:34 +0000
|
||||
Subject: [PATCH 34/69] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add
|
||||
Subject: [PATCH 15/52] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add
|
||||
support for the 7 segment display
|
||||
|
||||
This patch adds support for the 7 segment display of the device.
|
||||
@ -1,7 +1,7 @@
|
||||
From 4b711a4fa9907a0b0c786619833015bad8940568 Mon Sep 17 00:00:00 2001
|
||||
From c6b2c72494d81b6d552529d3931ce082985d44f1 Mon Sep 17 00:00:00 2001
|
||||
From: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
Date: Mon, 4 Apr 2022 18:53:32 +0000
|
||||
Subject: [PATCH 35/69] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
|
||||
Subject: [PATCH 16/52] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
|
||||
auxdisplay driver
|
||||
|
||||
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
@ -1,7 +1,7 @@
|
||||
From 6949c51b8190a3ec6c82b0362ce45b9a87acf7b5 Mon Sep 17 00:00:00 2001
|
||||
From 391b15bb569f5bc0b41ef31de5b9dd51e9a5ccf9 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Karlman <jonas@kwiboo.se>
|
||||
Date: Sun, 23 Dec 2018 02:24:38 +0100
|
||||
Subject: [PATCH 36/69] FROMLIST(v1): ASoC: hdmi-codec: reorder channel
|
||||
Subject: [PATCH 17/52] FROMLIST(v1): ASoC: hdmi-codec: reorder channel
|
||||
allocation list
|
||||
|
||||
Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx().
|
||||
@ -1,7 +1,7 @@
|
||||
From 94cbc52d4336ac9d9db13db90f0f2c7264368c81 Mon Sep 17 00:00:00 2001
|
||||
From f31321b94656600652e7214785d80dd67607e9ef Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Mon, 22 Nov 2021 09:15:21 +0000
|
||||
Subject: [PATCH 37/69] FROMLIST(v1): media: meson: vdec: esparser: check
|
||||
Subject: [PATCH 18/52] FROMLIST(v1): media: meson: vdec: esparser: check
|
||||
parsing state with hardware write pointer
|
||||
|
||||
Also check the hardware write pointer to check if ES Parser has stalled.
|
||||
@ -1,7 +1,7 @@
|
||||
From 24058bc29c31131aed9f446b8d207f30e08c77be Mon Sep 17 00:00:00 2001
|
||||
From ccfb2ced6c3bda64c6f41bd9c7837c0ca8c9ead7 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Roszak <benjamin545@gmail.com>
|
||||
Date: Mon, 23 Jan 2023 10:56:46 +0000
|
||||
Subject: [PATCH 38/69] FROMLIST(v2): media: meson: vdec: implement 10bit
|
||||
Subject: [PATCH 19/52] FROMLIST(v2): media: meson: vdec: implement 10bit
|
||||
bitstream handling
|
||||
|
||||
In order to support 10bit bitstream decoding, buffers and MMU
|
||||
@ -1,7 +1,7 @@
|
||||
From 024027c2878c87f5ee0963439fae1c24164bc382 Mon Sep 17 00:00:00 2001
|
||||
From 818b4f3161d46d9a2c440b8ba8021657b8121317 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Jourdan <mjourdan@baylibre.com>
|
||||
Date: Mon, 23 Jan 2023 11:07:04 +0000
|
||||
Subject: [PATCH 39/69] FROMLIST(v2): media: meson: vdec: add HEVC decode codec
|
||||
Subject: [PATCH 20/52] FROMLIST(v2): media: meson: vdec: add HEVC decode codec
|
||||
|
||||
Add initial HEVC codec for the Amlogic GXBB/GXL/GXM SoCs using
|
||||
the common "HEVC" decoder driver.
|
||||
@ -1,7 +1,7 @@
|
||||
From 4663bf7102e82064d156a9a12e24139f516098c3 Mon Sep 17 00:00:00 2001
|
||||
From 58bf6f6e59c22a472265a17a2420800c3136482b Mon Sep 17 00:00:00 2001
|
||||
From: Anand Moon <linux.amoon@gmail.com>
|
||||
Date: Wed, 22 Nov 2023 23:53:46 +0530
|
||||
Subject: [PATCH 40/69] FROMLIST(v4): dt-bindings: usb: Add the binding example
|
||||
Subject: [PATCH 21/52] FROMLIST(v4): dt-bindings: usb: Add the binding example
|
||||
for the Genesys Logic GL3523 hub
|
||||
|
||||
Add the binding example for the USB3.1 Genesys Logic GL3523
|
||||
@ -1,7 +1,7 @@
|
||||
From bfd238dd418d92920dc5d14c97bb6743a23fe187 Mon Sep 17 00:00:00 2001
|
||||
From a8fd419e5ae7d4232d09caa73918192273dc74e0 Mon Sep 17 00:00:00 2001
|
||||
From: Anand Moon <linux.amoon@gmail.com>
|
||||
Date: Tue, 10 Oct 2023 08:54:43 +0530
|
||||
Subject: [PATCH 41/69] FROMLIST(v4): arm64: dts: amlogic: Used onboard usb hub
|
||||
Subject: [PATCH 22/52] FROMLIST(v4): arm64: dts: amlogic: Used onboard usb hub
|
||||
reset on odroid n2
|
||||
|
||||
On Odroid n2/n2+ previously use gpio-hog to reset the usb hub,
|
||||
@ -1,7 +1,7 @@
|
||||
From fb42c49d5c13762278e961748f99a135b16aa54e Mon Sep 17 00:00:00 2001
|
||||
From 5ef1c858e834704d5ae23775d7e859f37a0ccdd4 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Mon, 30 Jan 2023 05:09:18 +0000
|
||||
Subject: [PATCH 42/69] FROMLIST(v1): arm64: dts: meson: radxa-zero2: add
|
||||
Subject: [PATCH 23/52] FROMLIST(v1): arm64: dts: meson: radxa-zero2: add
|
||||
pwm-fan support
|
||||
|
||||
The A311D on Zero2 needs active cooling and the board includes a header to
|
||||
@ -1,7 +1,7 @@
|
||||
From f88d7a934300717d0098341c27a069d263680f09 Mon Sep 17 00:00:00 2001
|
||||
From b283f7314af96a207cbaaaf7cfb8baef6f5503d2 Mon Sep 17 00:00:00 2001
|
||||
From: Haoran Liu <liuhaoran14@163.com>
|
||||
Date: Wed, 29 Nov 2023 03:34:05 -0800
|
||||
Subject: [PATCH 43/69] FROMLIST(v2): meson_plane: Add error handling
|
||||
Subject: [PATCH 24/52] FROMLIST(v2): meson_plane: Add error handling
|
||||
|
||||
This patch adds robust error handling to the meson_plane_create
|
||||
function in drivers/gpu/drm/meson/meson_plane.c. The function
|
||||
@ -1,7 +1,7 @@
|
||||
From 0ada604eb1aee519e7014605061c20ef7763763c Mon Sep 17 00:00:00 2001
|
||||
From 8a126faad7a89013f08e1988f046213c99af1a71 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Date: Sat, 23 Mar 2024 20:04:49 +0100
|
||||
Subject: [PATCH 44/69] FROMLIST(v1): iio: adc: meson: fix voltage reference
|
||||
Subject: [PATCH 25/52] FROMLIST(v1): iio: adc: meson: fix voltage reference
|
||||
selection field name typo
|
||||
|
||||
The field should be called "vref_voltage", without a typo in the word
|
||||
@ -1,7 +1,7 @@
|
||||
From 590a7fda90807fbf9c58d644145426960a610fcc Mon Sep 17 00:00:00 2001
|
||||
From 085649b4fb305f5280394b906ab8b9286fc7ebad Mon Sep 17 00:00:00 2001
|
||||
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Date: Sat, 23 Mar 2024 20:30:02 +0100
|
||||
Subject: [PATCH 45/69] FROMLIST(v1): iio: adc: consistently use bool and enum
|
||||
Subject: [PATCH 26/52] FROMLIST(v1): iio: adc: consistently use bool and enum
|
||||
in struct meson_sar_adc_param
|
||||
|
||||
Consistently use bool for any register bit that enables/disables
|
||||
@ -1,7 +1,7 @@
|
||||
From 37255e6d2fa6341a76518a632ee556813539973f Mon Sep 17 00:00:00 2001
|
||||
From 24720fcff9462db2603d6ccf1b67671676b50e52 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Date: Sat, 23 Mar 2024 20:35:58 +0100
|
||||
Subject: [PATCH 46/69] FROMLIST(v1): iio: adc: meson: simplify
|
||||
Subject: [PATCH 27/52] FROMLIST(v1): iio: adc: meson: simplify
|
||||
MESON_SAR_ADC_REG11 register access
|
||||
|
||||
Simply check the max_register value to decide whether
|
||||
@ -1,7 +1,7 @@
|
||||
From 6e79b2f5914f98242351d29897c391c8778c2172 Mon Sep 17 00:00:00 2001
|
||||
From c32f8f643e24d1e478cdd5056957e7e9e3b85077 Mon Sep 17 00:00:00 2001
|
||||
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
|
||||
Date: Mon, 29 Apr 2024 13:48:48 +0200
|
||||
Subject: [PATCH 47/69] FROMLIST(v1): ASoC: meson: Constify static
|
||||
Subject: [PATCH 28/52] FROMLIST(v1): ASoC: meson: Constify static
|
||||
snd_pcm_hardware
|
||||
|
||||
Static 'struct snd_pcm_hardware' is not modified by the driver and its
|
||||
@ -1,7 +1,7 @@
|
||||
From 6299ce68ab47b2c371cc707402bd1ea6f59e752d Mon Sep 17 00:00:00 2001
|
||||
From 10f4ba40b8ac1125f3216427fad0d4ea82f03b6b Mon Sep 17 00:00:00 2001
|
||||
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
|
||||
Date: Tue, 30 Apr 2024 16:02:20 +0200
|
||||
Subject: [PATCH 48/69] FROMLIST(v1): ASoC: meson: Use
|
||||
Subject: [PATCH 29/52] FROMLIST(v1): ASoC: meson: Use
|
||||
snd_soc_substream_to_rtd() for accessing private_data
|
||||
|
||||
Do not open-code snd_soc_substream_to_rtd().
|
||||
@ -1,7 +1,7 @@
|
||||
From 9bfbedf208542f00d5fcd39d7bee1601c655601b Mon Sep 17 00:00:00 2001
|
||||
From 3c20e23dc64f192cfb74a546244b2a5804865231 Mon Sep 17 00:00:00 2001
|
||||
From: Da Xue <da@libre.computer>
|
||||
Date: Fri, 24 May 2024 15:17:37 +0000
|
||||
Subject: [PATCH 49/69] FROMLIST(v1): net: mdio: meson-gxl set 28th bit in
|
||||
Subject: [PATCH 30/52] FROMLIST(v1): net: mdio: meson-gxl set 28th bit in
|
||||
eth_reg2
|
||||
|
||||
This bit is necessary to enable packets on the interface. Without this
|
||||
@ -1,7 +1,8 @@
|
||||
From 37c40fe68da65de963064481ce98e1fb08ed9d06 Mon Sep 17 00:00:00 2001
|
||||
From 019ce1acd2112465aafcd59be1c44b70aac58023 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Mon, 1 Jan 2024 07:48:39 +0000
|
||||
Subject: [PATCH 62/69] WIP: soc: amlogic: meson-gx-socinfo: Add S905L ID
|
||||
Subject: [PATCH 31/52] FROMLIST(v1): soc: amlogic: meson-gx-socinfo: Add S905L
|
||||
ID
|
||||
|
||||
Add the S905L SoC ID observed in several P271 boards:
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
From da8832786aa94197e7bcf420aa78c5283b055dad Mon Sep 17 00:00:00 2001
|
||||
From fbf4a552ce3e4cc22dd2a6efbf7f92133b8f2564 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Sat, 1 Jun 2024 15:46:42 +0000
|
||||
Subject: [PATCH 65/69] WIP: dt-bindings: media: amlogic,gx-vdec: add the GXLX
|
||||
SoC family
|
||||
Subject: [PATCH 32/52] FROMLIST(v1): dt-bindings: media: amlogic,gx-vdec: add
|
||||
the GXLX SoC family and update GXL
|
||||
|
||||
The GXLX SoC is a GXL variant that omits VP9 codec support. While we are here, add
|
||||
S905W and S905Y as GXL chips and sort the GXL comment.
|
||||
The GXLX SoC is a GXL variant that omits VP9 codec support. Also add S905W
|
||||
and S905Y as GXL chips and sort the GXL comment.
|
||||
|
||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
---
|
||||
@ -1,16 +1,16 @@
|
||||
From 1b994ed915398729aa50c709628176f928b2f0dc Mon Sep 17 00:00:00 2001
|
||||
From 2ab0518984ce62d4492448fb574b88c9ffa8f3e7 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Sat, 1 Jun 2024 15:51:07 +0000
|
||||
Subject: [PATCH 66/69] WIP: media: meson: vdec: add GXLX SoC platform
|
||||
Subject: [PATCH 33/52] FROMLIST(v1): media: meson: vdec: add GXLX SoC platform
|
||||
|
||||
The GXLX SoC is a GXL variant that omits VP9 codec support.
|
||||
Add the GXLX SoC platform which is based on GXL but omits the VP9 codec.
|
||||
|
||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
---
|
||||
drivers/staging/media/meson/vdec/vdec.c | 2 ++
|
||||
.../staging/media/meson/vdec/vdec_platform.c | 34 +++++++++++++++++++
|
||||
.../staging/media/meson/vdec/vdec_platform.h | 2 ++
|
||||
3 files changed, 38 insertions(+)
|
||||
drivers/staging/media/meson/vdec/vdec.c | 2 +
|
||||
.../staging/media/meson/vdec/vdec_platform.c | 44 +++++++++++++++++++
|
||||
.../staging/media/meson/vdec/vdec_platform.h | 2 +
|
||||
3 files changed, 48 insertions(+)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
|
||||
index de3e0345ab7c..5e5b296f93ba 100644
|
||||
@ -26,27 +26,15 @@ index de3e0345ab7c..5e5b296f93ba 100644
|
||||
.data = &vdec_platform_g12a },
|
||||
{ .compatible = "amlogic,sm1-vdec",
|
||||
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
index 083adf0d07d9..870e61dedd81 100644
|
||||
index 083adf0d07d9..ca0cb417d793 100644
|
||||
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
@@ -82,6 +82,34 @@ static const struct amvdec_format vdec_formats_gxl[] = {
|
||||
@@ -82,6 +82,44 @@ static const struct amvdec_format vdec_formats_gxl[] = {
|
||||
},
|
||||
};
|
||||
|
||||
+static const struct amvdec_format vdec_formats_gxlx[] = {
|
||||
+ {
|
||||
+ .pixfmt = V4L2_PIX_FMT_HEVC,
|
||||
+ .min_buffers = 4,
|
||||
+ .max_buffers = 24,
|
||||
+ .max_width = 3840,
|
||||
+ .max_height = 2160,
|
||||
+ .vdec_ops = &vdec_hevc_ops,
|
||||
+ .codec_ops = &codec_hevc_ops,
|
||||
+ .firmware_path = "meson/vdec/gxl_hevc.bin",
|
||||
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
|
||||
+ .flags = V4L2_FMT_FLAG_COMPRESSED |
|
||||
+ V4L2_FMT_FLAG_DYN_RESOLUTION,
|
||||
+ }, {
|
||||
+ .pixfmt = V4L2_PIX_FMT_H264,
|
||||
+ .min_buffers = 2,
|
||||
+ .max_buffers = 24,
|
||||
@ -58,13 +46,35 @@ index 083adf0d07d9..870e61dedd81 100644
|
||||
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
|
||||
+ .flags = V4L2_FMT_FLAG_COMPRESSED |
|
||||
+ V4L2_FMT_FLAG_DYN_RESOLUTION,
|
||||
+ }, {
|
||||
+ .pixfmt = V4L2_PIX_FMT_MPEG1,
|
||||
+ .min_buffers = 8,
|
||||
+ .max_buffers = 8,
|
||||
+ .max_width = 1920,
|
||||
+ .max_height = 1080,
|
||||
+ .vdec_ops = &vdec_1_ops,
|
||||
+ .codec_ops = &codec_mpeg12_ops,
|
||||
+ .firmware_path = "meson/vdec/gxl_mpeg12.bin",
|
||||
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
|
||||
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
|
||||
+ }, {
|
||||
+ .pixfmt = V4L2_PIX_FMT_MPEG2,
|
||||
+ .min_buffers = 8,
|
||||
+ .max_buffers = 8,
|
||||
+ .max_width = 1920,
|
||||
+ .max_height = 1080,
|
||||
+ .vdec_ops = &vdec_1_ops,
|
||||
+ .codec_ops = &codec_mpeg12_ops,
|
||||
+ .firmware_path = "meson/vdec/gxl_mpeg12.bin",
|
||||
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
|
||||
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
static const struct amvdec_format vdec_formats_gxm[] = {
|
||||
{
|
||||
.pixfmt = V4L2_PIX_FMT_VP9,
|
||||
@@ -190,6 +218,12 @@ const struct vdec_platform vdec_platform_gxl = {
|
||||
@@ -190,6 +228,12 @@ const struct vdec_platform vdec_platform_gxl = {
|
||||
.revision = VDEC_REVISION_GXL,
|
||||
};
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
From 357f7ec77196b67ef2c467b96b73e3267c9f2b39 Mon Sep 17 00:00:00 2001
|
||||
From 940583242da6c14e1906abbc76cff986ed32e2a3 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Date: Sat, 23 Mar 2024 20:38:59 +0100
|
||||
Subject: [PATCH 63/69] WIP: dt-bindings: iio: adc: amlogic,meson-saradc: add
|
||||
GXLX SoC compatible
|
||||
Subject: [PATCH 34/52] FROMLIST(v1): dt-bindings: iio: adc:
|
||||
amlogic,meson-saradc: add GXLX SoC compatible
|
||||
|
||||
Add a compatible string for the GXLX SoC. GXLX is very similar to GXL but has three
|
||||
Add support for the GXLX SoC. GXLX is very similar to GXL but has three
|
||||
additional bits in MESON_SAR_ADC_REG12 for the three MPLL clocks.
|
||||
|
||||
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
---
|
||||
.../devicetree/bindings/iio/adc/amlogic,meson-saradc.yaml | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
@ -1,14 +1,16 @@
|
||||
From e807a7ea1ca1eefcb39eafc9d4bfe88226fd93e6 Mon Sep 17 00:00:00 2001
|
||||
From d284f5b692c07f5527129eefa708c1e47d38e3a0 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Date: Sat, 23 Mar 2024 20:44:41 +0100
|
||||
Subject: [PATCH 64/69] WIP: iio: adc: meson: add support for the GXLX SoC
|
||||
Subject: [PATCH 35/52] FROMLIST(v1): iio: adc: meson: add support for the GXLX
|
||||
SoC
|
||||
|
||||
The SARADC IP on GXLX is identical to the one found on GXL SoCs: except GXLX requires
|
||||
poking the first three bits in the MESON_SAR_ADC_REG12 register to get the three MPLL
|
||||
clocks (used as clock generators for the audio frequencies) to work. Register values
|
||||
are taken from the vendor kernel.
|
||||
The SARADC IP on GXLX is identical to the one found on GXL SoCs: except
|
||||
GXLX requires poking the first three bits in the MESON_SAR_ADC_REG12
|
||||
register to get the three MPLL clocks (used as clock generators for the
|
||||
audio frequencies) to work. Register bits are from the vendor kernel.
|
||||
|
||||
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
---
|
||||
drivers/iio/adc/meson_saradc.c | 31 +++++++++++++++++++++++++++++++
|
||||
1 file changed, 31 insertions(+)
|
||||
@ -1,12 +1,13 @@
|
||||
From 07f53466522aa22a385caaa7893dc247441d863a Mon Sep 17 00:00:00 2001
|
||||
From 3fe02d7f4044de21d61f70db4bef7f2f34bfaba6 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Mon, 1 Jan 2024 07:13:19 +0000
|
||||
Subject: [PATCH 61/69] WIP: dt-bindings: arm: amlogic: add GXLX/S905L/p271
|
||||
reference board
|
||||
Subject: [PATCH 36/52] FROMLIST(v1): dt-bindings: arm: amlogic: add
|
||||
GXLX/S905L/p271 reference board
|
||||
|
||||
Add bindings for the Amlogic GXLX based S905L SoC and P271 reference design board. The
|
||||
S905L is a cost engineered design similar to the P281 (S905W) and is derived from P212
|
||||
(S905X). S905L omits VP9 codec support and uses Mali 450-MP2 (not MP3).
|
||||
Add support for an Amlogic GXLX based S905L SoC and P271 reference
|
||||
design board. The S905L is a low-cost design similar to the P281
|
||||
(S905W) and is similarly derived from P212 (S905X). However S905L
|
||||
omits support for the VP9 codec and uses Mali 450-MP2 (not MP3).
|
||||
|
||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
---
|
||||
@ -14,10 +15,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
|
||||
index 5d52065abe72..79deb7bfe698 100644
|
||||
index 949537cea6be..d2aa3a05850a 100644
|
||||
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
|
||||
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
|
||||
@@ -108,6 +108,13 @@ properties:
|
||||
@@ -107,6 +107,13 @@ properties:
|
||||
- const: amlogic,s905d
|
||||
- const: amlogic,meson-gxl
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
From 85fd969f38153362aa6859fdd28f71367f4ee53e Mon Sep 17 00:00:00 2001
|
||||
From 9beefd846bb397e116584c97d8b318e3ba7ee026 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Mon, 1 Jan 2024 07:40:15 +0000
|
||||
Subject: [PATCH 67/69] WIP: arm64: dts: meson: add p271 support
|
||||
Subject: [PATCH 37/52] FROMLIST(v1): arm64: dts: meson: add GXLX/S905L/p271
|
||||
support
|
||||
|
||||
Add a device-tree for the GXLX Amlogic P271 (S905L) reference design board. This
|
||||
is a low-cost design similar to P281 (S905W) and P212 (S905X) but with silicon
|
||||
differences to omit VP9 and use Mali 450-MP2 (not MP3). The SoC is marked with
|
||||
S905L and "2" (believed to denote MP2) resulting in some chip distributor stock
|
||||
lists (and subsequent box vendor marketing) describing it as an S905L2 chip.
|
||||
Add a device-tree for the GXLX Amlogic P271 (S905L) reference design
|
||||
board. This is a low-cost design similar to P281 (S905W) but with
|
||||
silicon differences to omit VP9 and use Mali 450-MP2 (not MP3). The
|
||||
SoC is marked with S905L and "2" (believed to denote MP2) resulting
|
||||
in chip distributor stock lists and Android STB marketing sometimes
|
||||
describing it as an S905L2 chip.
|
||||
|
||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
---
|
||||
@ -17,10 +19,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxlx-s905l-p271.dts
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
|
||||
index ccfac417ca10..d106a18c39a8 100644
|
||||
index 1ab160bf928a..b046aaf76aeb 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/Makefile
|
||||
+++ b/arch/arm64/boot/dts/amlogic/Makefile
|
||||
@@ -67,6 +67,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
|
||||
@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
|
||||
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
|
||||
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
|
||||
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
|
||||
@ -1,8 +1,8 @@
|
||||
From c63dc0d2975b01f94848480801d32ca9501bae32 Mon Sep 17 00:00:00 2001
|
||||
From 49884838fc7caee92816149390d2cda95a5a1bf0 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Mon, 5 Apr 2021 13:48:34 +0000
|
||||
Subject: [PATCH 51/69] WIP: dt-bindings: arm: amlogic: add support for
|
||||
Dreambox One/Two
|
||||
Subject: [PATCH 38/52] FROMLIST(v1): dt-bindings: arm: amlogic: add support
|
||||
for Dreambox One/Two
|
||||
|
||||
The Dreambox One and Dreambox Two are DVBS/T2 receiver boxes based
|
||||
on the Amlogic W400 reference board with an S922X chip.
|
||||
@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
|
||||
index 949537cea6be..0cb0721d83e3 100644
|
||||
index d2aa3a05850a..d3fb1f0a159f 100644
|
||||
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
|
||||
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
|
||||
@@ -168,6 +168,8 @@ properties:
|
||||
@@ -175,6 +175,8 @@ properties:
|
||||
- azw,gtking
|
||||
- azw,gtking-pro
|
||||
- bananapi,bpi-m2s
|
||||
@ -1,8 +1,8 @@
|
||||
From 1dc7d697233d1832d222e6e72afe2dcbc9ef19c9 Mon Sep 17 00:00:00 2001
|
||||
From 1b9ab39300c9f76a273d37b6d664472be99be939 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Mon, 5 Apr 2021 13:51:20 +0000
|
||||
Subject: [PATCH 52/69] WIP: arm64: dts: meson: add initial device-trees for
|
||||
Dreambox One/Two
|
||||
Subject: [PATCH 39/52] FROMLIST(v1): arm64: dts: meson: add initial
|
||||
device-trees for Dreambox One/Two
|
||||
|
||||
Dreambox One and Dreambox Two are based on the Amlogic W400 reference
|
||||
board with an S922X chip and the following specs:
|
||||
@ -40,7 +40,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
|
||||
index 1ab160bf928a..3b2e11a82df2 100644
|
||||
index b046aaf76aeb..d4ad5b20610a 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/Makefile
|
||||
+++ b/arch/arm64/boot/dts/amlogic/Makefile
|
||||
@@ -17,6 +17,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
|
||||
@ -1,7 +1,8 @@
|
||||
From 8be562d97c6499157ef7940362abeb62c42b8b51 Mon Sep 17 00:00:00 2001
|
||||
From e18690779cce33887f27cfd97f8e8fc8351db02b Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Wed, 19 Jan 2022 02:40:20 +0000
|
||||
Subject: [PATCH 59/69] WIP: dt-bindings: arm: amlogic: add OSMC Vero 4K
|
||||
Subject: [PATCH 40/52] FROMLIST(v1): dt-bindings: arm: amlogic: add OSMC Vero
|
||||
4K
|
||||
|
||||
Add support for the OSMC Vero 4K
|
||||
|
||||
@ -11,7 +12,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
|
||||
index 0cb0721d83e3..5d52065abe72 100644
|
||||
index d3fb1f0a159f..79deb7bfe698 100644
|
||||
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
|
||||
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
|
||||
@@ -91,6 +91,7 @@ properties:
|
||||
@ -1,7 +1,8 @@
|
||||
From f370eaf064a3dd1620d9e47edd6738eff74531fa Mon Sep 17 00:00:00 2001
|
||||
From 6ee61e29f4863e930a49b5522438ce0e086f0902 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Wed, 19 Jan 2022 04:06:17 +0000
|
||||
Subject: [PATCH 60/69] WIP: arm64: dts: meson: add support for OSMC Vero 4K
|
||||
Subject: [PATCH 41/52] FROMLIST(v1): arm64: dts: meson: add support for OSMC
|
||||
Vero 4K
|
||||
|
||||
The OSMC Vero 4K device is based on the Amlogic S905X (P212) reference
|
||||
design with the following specifications:
|
||||
@ -28,7 +29,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
|
||||
index 3b2e11a82df2..ccfac417ca10 100644
|
||||
index d4ad5b20610a..d106a18c39a8 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/Makefile
|
||||
+++ b/arch/arm64/boot/dts/amlogic/Makefile
|
||||
@@ -51,6 +51,13 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
|
||||
@ -0,0 +1,68 @@
|
||||
From a2eec503dc2236727808124d2d517b0ee86aa070 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Tue, 4 Jun 2024 10:49:58 +0000
|
||||
Subject: [PATCH 42/52] WIP: media: meson: vdec: add HEVC and remove MPEG1/2
|
||||
from GXLX
|
||||
|
||||
This patch is required until GXLX support has been merged upstream.
|
||||
|
||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
---
|
||||
.../staging/media/meson/vdec/vdec_platform.c | 34 +++++++------------
|
||||
1 file changed, 12 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
index ca0cb417d793..870e61dedd81 100644
|
||||
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||||
@@ -84,6 +84,18 @@ static const struct amvdec_format vdec_formats_gxl[] = {
|
||||
|
||||
static const struct amvdec_format vdec_formats_gxlx[] = {
|
||||
{
|
||||
+ .pixfmt = V4L2_PIX_FMT_HEVC,
|
||||
+ .min_buffers = 4,
|
||||
+ .max_buffers = 24,
|
||||
+ .max_width = 3840,
|
||||
+ .max_height = 2160,
|
||||
+ .vdec_ops = &vdec_hevc_ops,
|
||||
+ .codec_ops = &codec_hevc_ops,
|
||||
+ .firmware_path = "meson/vdec/gxl_hevc.bin",
|
||||
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
|
||||
+ .flags = V4L2_FMT_FLAG_COMPRESSED |
|
||||
+ V4L2_FMT_FLAG_DYN_RESOLUTION,
|
||||
+ }, {
|
||||
.pixfmt = V4L2_PIX_FMT_H264,
|
||||
.min_buffers = 2,
|
||||
.max_buffers = 24,
|
||||
@@ -95,28 +107,6 @@ static const struct amvdec_format vdec_formats_gxlx[] = {
|
||||
.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
|
||||
.flags = V4L2_FMT_FLAG_COMPRESSED |
|
||||
V4L2_FMT_FLAG_DYN_RESOLUTION,
|
||||
- }, {
|
||||
- .pixfmt = V4L2_PIX_FMT_MPEG1,
|
||||
- .min_buffers = 8,
|
||||
- .max_buffers = 8,
|
||||
- .max_width = 1920,
|
||||
- .max_height = 1080,
|
||||
- .vdec_ops = &vdec_1_ops,
|
||||
- .codec_ops = &codec_mpeg12_ops,
|
||||
- .firmware_path = "meson/vdec/gxl_mpeg12.bin",
|
||||
- .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
|
||||
- .flags = V4L2_FMT_FLAG_COMPRESSED,
|
||||
- }, {
|
||||
- .pixfmt = V4L2_PIX_FMT_MPEG2,
|
||||
- .min_buffers = 8,
|
||||
- .max_buffers = 8,
|
||||
- .max_width = 1920,
|
||||
- .max_height = 1080,
|
||||
- .vdec_ops = &vdec_1_ops,
|
||||
- .codec_ops = &codec_mpeg12_ops,
|
||||
- .firmware_path = "meson/vdec/gxl_mpeg12.bin",
|
||||
- .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
|
||||
- .flags = V4L2_FMT_FLAG_COMPRESSED,
|
||||
},
|
||||
};
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 7fc9e86945350fc1be6e6c28274e2da7b7ec01c3 Mon Sep 17 00:00:00 2001
|
||||
From c4bf5b5b549f9ec2bb7efa68f2deb87839160375 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Baierl <ichgeh@imkreisrum.de>
|
||||
Date: Tue, 2 Apr 2024 14:22:52 +0000
|
||||
Subject: [PATCH 50/69] WIP: media: meson: vdec: reintroduce wiggle room
|
||||
Subject: [PATCH 43/52] WIP: media: meson: vdec: reintroduce wiggle room
|
||||
|
||||
Without the wiggle room, it happens that matching offsets can't be found.
|
||||
This results in non-matches and afterwards in frame drops in userspace apps.
|
||||
@ -0,0 +1,28 @@
|
||||
From 84bba1f7c639992bf7beb27a777e366eb30d635f Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Tue, 14 Mar 2023 01:13:15 +0000
|
||||
Subject: [PATCH 44/52] WIP: media: meson: vdec: fix memory leak of 'new_frame'
|
||||
|
||||
Reported-by: kernel test robot <lkp@intel.com>
|
||||
Reported-by: Dan Carpenter <error27@gmail.com>
|
||||
Link: https://lore.kernel.org/r/202303120441.YFGHDOya-lkp@intel.com/
|
||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
---
|
||||
drivers/staging/media/meson/vdec/codec_hevc.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/codec_hevc.c b/drivers/staging/media/meson/vdec/codec_hevc.c
|
||||
index fcaaa1ad50b8..b0d8623c3c7d 100644
|
||||
--- a/drivers/staging/media/meson/vdec/codec_hevc.c
|
||||
+++ b/drivers/staging/media/meson/vdec/codec_hevc.c
|
||||
@@ -731,6 +731,7 @@ codec_hevc_prepare_new_frame(struct amvdec_session *sess)
|
||||
vbuf = v4l2_m2m_dst_buf_remove(sess->m2m_ctx);
|
||||
if (!vbuf) {
|
||||
dev_err(sess->core->dev, "No dst buffer available\n");
|
||||
+ kfree(new_frame);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From afb8fdb7130c6d2a31dba2e0a66e4db299bae4ad Mon Sep 17 00:00:00 2001
|
||||
From 3ef227118302ee6ab5afac361ad6261c07deed45 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Mon, 1 Jan 2024 06:15:40 +0000
|
||||
Subject: [PATCH 53/69] WIP: arm64: dts: meson: increase SD speeds on Minix Neo
|
||||
Subject: [PATCH 45/52] WIP: arm64: dts: meson: increase SD speeds on Minix Neo
|
||||
U9-H
|
||||
|
||||
Lets see what happens/breaks when all the fancy modes are added
|
||||
@ -1,7 +1,7 @@
|
||||
From df7565c87afd20714c96fbb3f5847ff6c20bd220 Mon Sep 17 00:00:00 2001
|
||||
From 6b2ef08327a276b9760926bbbc62a5739b92bb28 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Fri, 5 Jan 2024 03:07:58 +0000
|
||||
Subject: [PATCH 54/69] WIP: arm64: dts: meson: fixup Minix U9-H wifi
|
||||
Subject: [PATCH 46/52] WIP: arm64: dts: meson: fixup Minix U9-H wifi
|
||||
|
||||
I think the 'drop compatible' change conflicted so remove this too.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 089ad862d61790d7fca3f372762fd53f684299c0 Mon Sep 17 00:00:00 2001
|
||||
From a3aa1beabdba84dedb6214641823870d5691e6e1 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Tue, 18 Jan 2022 15:09:12 +0000
|
||||
Subject: [PATCH 55/69] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
|
||||
Subject: [PATCH 47/52] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
|
||||
100MHz
|
||||
|
||||
Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but
|
||||
@ -1,7 +1,7 @@
|
||||
From a1afe83c0d099c5fe033d7e4e74aaae5edc874bd Mon Sep 17 00:00:00 2001
|
||||
From 2fee9c1ed3b4acedb96d9cd6c56de114d18e80af Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Wed, 19 Jan 2022 06:45:06 +0000
|
||||
Subject: [PATCH 56/69] WIP: arm64: dts: meson: add UHS SDIO capabilities to
|
||||
Subject: [PATCH 48/52] WIP: arm64: dts: meson: add UHS SDIO capabilities to
|
||||
p212/p23x/q20x
|
||||
|
||||
Add UHS capabilities to the SDIO node to enable 100MHz speeds.
|
||||
@ -1,7 +1,7 @@
|
||||
From 515b6a825199935a85ff27f0778a007f4a582799 Mon Sep 17 00:00:00 2001
|
||||
From 68a2c518918cb350e6092ce59f1338e3e0283a8a Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Tue, 18 Jan 2022 15:18:32 +0000
|
||||
Subject: [PATCH 57/69] WIP: arm64: dts: meson: remove SDIO node from Khadas
|
||||
Subject: [PATCH 49/52] WIP: arm64: dts: meson: remove SDIO node from Khadas
|
||||
VIM1
|
||||
|
||||
Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we
|
||||
@ -1,7 +1,7 @@
|
||||
From 351dffe709349c9c7eee6700e4f57c1d05f08501 Mon Sep 17 00:00:00 2001
|
||||
From 1e36d0165e86298b3497f8014de77c0e67714a7b Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Wed, 3 Jan 2024 03:14:06 +0000
|
||||
Subject: [PATCH 58/69] WIP: arm64: dts: meson: drop broadcom compatible from
|
||||
Subject: [PATCH 50/52] WIP: arm64: dts: meson: drop broadcom compatible from
|
||||
reference board SDIO nodes
|
||||
|
||||
Remove the Broadcom compatible to allow Android STB boards using Qualcom QCA9377
|
||||
@ -1,7 +1,7 @@
|
||||
From c502027cafd182fd76467b76c7c271706ceab466 Mon Sep 17 00:00:00 2001
|
||||
From 2407614a32bde162b1ca0114525121d6cca5489e Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Sun, 26 May 2024 12:08:54 +0000
|
||||
Subject: [PATCH 68/69] WIP: ASoC: Add support for ti,pcm5242 to the pcm512x
|
||||
Subject: [PATCH 51/52] WIP: ASoC: Add support for ti,pcm5242 to the pcm512x
|
||||
driver
|
||||
|
||||
Add compatibles to enable support for the ti,pcm5242 DAC chip in the
|
||||
@ -1,7 +1,7 @@
|
||||
From 81f79be44cb62b75eadf9acdb61f877d97ee9f7c Mon Sep 17 00:00:00 2001
|
||||
From 9fa1b4e3d5c5cbdbac22a9db1db5e8725dfcfcda Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Sun, 26 May 2024 12:53:07 +0000
|
||||
Subject: [PATCH 69/69] WIP: arm64: dts: meson: add Odroid-C2 HiFi-Shield
|
||||
Subject: [PATCH 52/52] WIP: arm64: dts: meson: add Odroid-C2 HiFi-Shield
|
||||
boards
|
||||
|
||||
Add experimental device-tree files for Odroid C2 with HiFi-Shield+ (pcm5102a)
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 6.9.3 Kernel Configuration
|
||||
# Linux/arm64 6.9.5 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnu-gcc-13.2.0 (GCC) 13.2.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user