| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-09-21 09:39:11 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-09-21 09:39:11 UTC |
| parent | 79d4b73c55095abff8d79a3d3f6781120629872c |
| .SRCINFO | +4 | -4 |
| PKGBUILD | +3 | -3 |
| armlfs.patch | +96 | -96 |
diff --git a/.SRCINFO b/.SRCINFO index 2320209..1909eb4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = linux-armlfs-lts - pkgver = 6.6.101 + pkgver = 6.6.107 pkgrel = 1 url = http://www.kernel.org/ arch = armv7h @@ -15,7 +15,7 @@ pkgbase = linux-armlfs-lts makedepends = uboot-tools options = !strip source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.6.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.6.101.xz + source = https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.6.107.xz source = armlfs.patch source = kernel.its source = kernel.keyblock @@ -23,8 +23,8 @@ pkgbase = linux-armlfs-lts source = 60-linux.hook source = config sha256sums = d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0 - sha256sums = 8d18b319112d0949b677d2212926bbb8c95fc915a7b6047f93f4f553397a56f7 - sha256sums = 2384dd315c4852dcd9ea0bdc0f23714e29fa05f4049d4f3c357e10ec4178a917 + sha256sums = 18f7f4b2d9bc9fa168f93dcafd95cc0cbbf018cc4b14adb59fffbaf6c4a00837 + sha256sums = 3b65b334702e89018ebef2634ce6341d2dc5dd322fda1647e75c8348b77a3c86 sha256sums = 91c73d902368f464c64626128932220a5ca7d26f7ac25eec00c1865810c51173 sha256sums = 4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb sha256sums = bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b diff --git a/PKGBUILD b/PKGBUILD index 0686318..5d09c6a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,7 @@ pkgbase=linux-armlfs${_xname} _srcname=linux-6.6 _kernelname=${pkgbase#linux} _desc="Veyron Speedy" -pkgver=6.6.101 +pkgver=6.6.107 pkgrel=1 arch=('armv7h') url="http://www.kernel.org/" @@ -169,8 +169,8 @@ for _p in ${pkgname[@]}; do done sha256sums=('d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0' - '8d18b319112d0949b677d2212926bbb8c95fc915a7b6047f93f4f553397a56f7' - '2384dd315c4852dcd9ea0bdc0f23714e29fa05f4049d4f3c357e10ec4178a917' + '18f7f4b2d9bc9fa168f93dcafd95cc0cbbf018cc4b14adb59fffbaf6c4a00837' + '3b65b334702e89018ebef2634ce6341d2dc5dd322fda1647e75c8348b77a3c86' '91c73d902368f464c64626128932220a5ca7d26f7ac25eec00c1865810c51173' '4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb' 'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b' diff --git a/armlfs.patch b/armlfs.patch index f8a40ed..bfd30f4 100644 --- a/armlfs.patch +++ b/armlfs.patch @@ -1,4 +1,4 @@ -From 4e5599461352d46e89e162346b6a6f8d48f134d0 Mon Sep 17 00:00:00 2001 +From b75a4f67000094a5ea8f31b5fcda19de76f5def6 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Mon, 27 Aug 2018 10:30:55 +0000 Subject: [PATCH 01/35] drivers: clk-rk3288: support for dedicating NPLL to a @@ -13,7 +13,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com> 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c -index baa5aebd32771..11493f0be2b1d 100644 +index baa5aebd3277..11493f0be2b1 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -195,10 +195,14 @@ PNAME(mux_ddrphy_p) = { "dpll_ddr", "gpll_ddr" }; @@ -149,7 +149,7 @@ index baa5aebd32771..11493f0be2b1d 100644 if (IS_ERR(ctx)) { pr_err("%s: rockchip clk init failed\n", __func__); diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index 758ebaf2236bf..7ee324e4186fb 100644 +index 758ebaf2236b..7ee324e4186f 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -510,6 +510,9 @@ struct clk *rockchip_clk_register_muxgrf(const char *name, @@ -166,7 +166,7 @@ index 758ebaf2236bf..7ee324e4186fb 100644 2.44.0 -From 91d5d562b5c2dd6e5102f49be4acf87601a8f6ac Mon Sep 17 00:00:00 2001 +From b876701a0359e81c8185ee483db6e912ac867810 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Wed, 22 Aug 2018 18:36:40 +0000 Subject: [PATCH 02/35] drm: dw_hdmi-rockchip: better clock selection logic and @@ -199,7 +199,7 @@ Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com> 1 file changed, 166 insertions(+), 113 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -index aae48e906af11..81f8a82aa5d46 100644 +index aae48e906af1..81f8a82aa5d4 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -80,8 +80,13 @@ struct rockchip_hdmi { @@ -617,7 +617,7 @@ index aae48e906af11..81f8a82aa5d46 100644 2.44.0 -From 566a1dc71986c281a4640d102bb567a6dab40288 Mon Sep 17 00:00:00 2001 +From 0beb20cb47c3bf0a824ba3c9ff19e0835b21f19d Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Mon, 27 Aug 2018 19:00:50 +0000 Subject: [PATCH 03/35] dts: rk3288: support for dedicating npll to a vop @@ -632,7 +632,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index 8593a83599376..1cfa4eda5abf9 100644 +index 8593a8359937..1cfa4eda5abf 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -867,12 +867,14 @@ @@ -656,7 +656,7 @@ index 8593a83599376..1cfa4eda5abf9 100644 2.44.0 -From f9c460d1e0df8838b20322508314e90203d00fe8 Mon Sep 17 00:00:00 2001 +From 95955bf78d09da3a7fa5ceba67ebdb07987772a4 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Mon, 27 Aug 2018 19:03:49 +0000 Subject: [PATCH 04/35] dts: rk3288-veyron-chromebook: dedicate npll to @@ -673,7 +673,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com> 1 file changed, 62 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi -index 092316be67f74..e4d5c02406579 100644 +index 092316be67f7..e4d5c0240657 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi @@ -83,6 +83,68 @@ @@ -749,7 +749,7 @@ index 092316be67f74..e4d5c02406579 100644 2.44.0 -From f4fc9859a390a47189283ac847e20bfa0da03c4a Mon Sep 17 00:00:00 2001 +From aa9b2910081d6de9b6fa2d64d336948600c7a027 Mon Sep 17 00:00:00 2001 From: SolidHal <hal@halemmerich.com> Date: Sun, 21 Oct 2018 16:40:15 -0500 Subject: [PATCH 05/35] Added a second reset when having an issue reading the @@ -772,7 +772,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com> 1 file changed, 8 insertions(+) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 3564a0f63c9c7..fbfc5c628f144 100644 +index 3564a0f63c9c..fbfc5c628f14 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1028,6 +1028,7 @@ static unsigned int mmc_blk_data_timeout_ms(struct mmc_host *host, @@ -802,7 +802,7 @@ index 3564a0f63c9c7..fbfc5c628f144 100644 2.44.0 -From 49f3a8cd6ae78324c903c4923cd4e3f86558556d Mon Sep 17 00:00:00 2001 +From 46d4d1c32ac9682935870474f2cbcb8e83efaccb Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr> Date: Tue, 9 Oct 2018 22:01:07 +0200 Subject: [PATCH 06/35] block: partitions: efi: Ignore bizarre Chromebook GPT @@ -842,7 +842,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr> 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/block/partitions/efi.c b/block/partitions/efi.c -index 7acba66eed481..087032a4705e7 100644 +index 7acba66eed48..087032a4705e 100644 --- a/block/partitions/efi.c +++ b/block/partitions/efi.c @@ -328,23 +328,34 @@ static gpt_header *alloc_read_gpt_header(struct parsed_partitions *state, @@ -938,7 +938,7 @@ index 7acba66eed481..087032a4705e7 100644 } diff --git a/block/partitions/efi.h b/block/partitions/efi.h -index 84b9f36b9e479..09726227e8913 100644 +index 84b9f36b9e47..09726227e891 100644 --- a/block/partitions/efi.h +++ b/block/partitions/efi.h @@ -26,7 +26,8 @@ @@ -955,7 +955,7 @@ index 84b9f36b9e479..09726227e8913 100644 2.44.0 -From f50cf6c9d6a6580b08a05692740989db2057fdca Mon Sep 17 00:00:00 2001 +From 871bfafccee8439ff30ff824092592bf95db0ea5 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr> Date: Tue, 30 Oct 2018 22:44:54 +0100 Subject: [PATCH 07/35] mmc: Added a flag to disable cache flush during reset @@ -978,7 +978,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr> 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index cf396e8f34e98..135cba5d5aa39 100644 +index cf396e8f34e9..135cba5d5aa3 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -409,6 +409,8 @@ int mmc_of_parse(struct mmc_host *host) @@ -991,7 +991,7 @@ index cf396e8f34e98..135cba5d5aa39 100644 /* Must be after "non-removable" check */ if (device_property_read_u32(dev, "fixed-emmc-driver-type", &drv_type) == 0) { diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index 7e39017e440fb..a8406756299d9 100644 +index 7e39017e440f..a8406756299d 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -2238,6 +2238,12 @@ static int mmc_runtime_resume(struct mmc_host *host) @@ -1028,7 +1028,7 @@ index 7e39017e440fb..a8406756299d9 100644 if ((host->caps & MMC_CAP_HW_RESET) && host->ops->card_hw_reset && mmc_can_reset(card)) { diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index 62a6847a3b6f0..d80cc06fa2c6e 100644 +index 62a6847a3b6f..d80cc06fa2c6 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -427,6 +427,7 @@ struct mmc_host { @@ -1043,7 +1043,7 @@ index 62a6847a3b6f0..d80cc06fa2c6e 100644 2.44.0 -From 85950e4933c5baf13450796a95fb6261d17f2891 Mon Sep 17 00:00:00 2001 +From 6a2a9b03ea5e7367a41d6aa5278f80d01de33d78 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr> Date: Thu, 1 Nov 2018 21:31:26 +0100 Subject: [PATCH 08/35] arm: dts: veyron: Added a flag to disable cache flush @@ -1061,7 +1061,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr> 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi b/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi -index d838bf0d5d9a0..7aeb70e9b828b 100644 +index d838bf0d5d9a..7aeb70e9b828 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi @@ -157,6 +157,7 @@ @@ -1076,7 +1076,7 @@ index d838bf0d5d9a0..7aeb70e9b828b 100644 2.44.0 -From 3a34a2cac6dfba501acc14630a1d439562a213a8 Mon Sep 17 00:00:00 2001 +From f20c2a59f29965d96232223486564b6308bb8b95 Mon Sep 17 00:00:00 2001 From: Hal Emmerich <hal@halemmerich.com> Date: Wed, 21 Aug 2019 16:52:41 -0500 Subject: [PATCH 09/35] Fix ath9k dwc2 init frame overruns @@ -1095,7 +1095,7 @@ communicate properly. In my testing this did not impact network speeds. 1 file changed, 10 insertions(+) diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c -index 0d4495c6b9f7b..3444cfd358404 100644 +index 0d4495c6b9f7..3444cfd35840 100644 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c @@ -1528,6 +1528,16 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh, @@ -1119,7 +1119,7 @@ index 0d4495c6b9f7b..3444cfd358404 100644 2.44.0 -From 263c4b8a24d3a07933cde721ce8dd9d73412a2ec Mon Sep 17 00:00:00 2001 +From 1287446ac4f9ab4735c2ee60c034f853bfb0f872 Mon Sep 17 00:00:00 2001 From: barzur <boris@konbu.org> Date: Fri, 12 Jul 2019 11:33:32 +0900 Subject: [PATCH 10/35] usb/dwc2/hcd: channel halt may not be an error @@ -1159,7 +1159,7 @@ meantime I'm including it here. 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c -index c1de38de28061..79ad20b3f863e 100644 +index c1de38de2806..79ad20b3f863 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -2457,7 +2457,8 @@ static void dwc2_free_dma_aligned_buffer(struct urb *urb) @@ -1173,7 +1173,7 @@ index c1de38de28061..79ad20b3f863e 100644 kfree(urb->transfer_buffer); urb->transfer_buffer = stored_xfer_buffer; diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c -index 5c7538d498dd1..96dc5d8115d2c 100644 +index 5c7538d498dd..96dc5d8115d2 100644 --- a/drivers/usb/dwc2/hcd_intr.c +++ b/drivers/usb/dwc2/hcd_intr.c @@ -1935,7 +1935,8 @@ static void dwc2_hc_chhltd_intr_dma(struct dwc2_hsotg *hsotg, @@ -1190,7 +1190,7 @@ index 5c7538d498dd1..96dc5d8115d2c 100644 2.44.0 -From 864339200822529e3bbb5311186a0c842dad2575 Mon Sep 17 00:00:00 2001 +From 980618b022755316c833357bf864792537a69ce6 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Tue, 8 Oct 2019 11:03:37 +0000 Subject: [PATCH 11/35] drm/panel: edp: Extend Innolux N116BGE mode info for @@ -1202,7 +1202,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com> 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c -index 53b3b24d7d7c0..dd6fdd3d45891 100644 +index 53b3b24d7d7c..dd6fdd3d4589 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -1309,16 +1309,25 @@ static const struct panel_desc innolux_n116bca_ea1 = { @@ -1237,7 +1237,7 @@ index 53b3b24d7d7c0..dd6fdd3d45891 100644 2.44.0 -From 0add990fd479274047dba6fc12de314fa3813030 Mon Sep 17 00:00:00 2001 +From 45de67155354f78f9f7e56bc87db0e064ff24d72 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Tue, 8 Oct 2019 11:12:33 +0000 Subject: [PATCH 12/35] ARM: dts: rockchip: Adjust rk3288-veyron n116bge mode @@ -1253,7 +1253,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi -index 32c0f10765dd3..ea20818202fce 100644 +index 32c0f10765dd..ea20818202fc 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi @@ -62,13 +62,13 @@ @@ -1276,7 +1276,7 @@ index 32c0f10765dd3..ea20818202fce 100644 2.44.0 -From f57323ff4669e0eb05f93b4bae9a158f96a52efe Mon Sep 17 00:00:00 2001 +From 2897d9e5858cdc0432293978d98af5469bd8bdb4 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Tue, 28 Sep 2021 20:23:13 +0300 Subject: [PATCH 13/35] Revert "clk: divider: Implement and wire up @@ -1291,7 +1291,7 @@ in my tree to be able to test the rest of 5.15 rc's. 1 file changed, 23 deletions(-) diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c -index a2c2b5203b0a9..9a63a0447d6fe 100644 +index a2c2b5203b0a..9a63a0447d6f 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -446,27 +446,6 @@ static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate, @@ -1342,7 +1342,7 @@ index a2c2b5203b0a9..9a63a0447d6fe 100644 2.44.0 -From 9d3fd7230f6127274483020c34cd752002895119 Mon Sep 17 00:00:00 2001 +From f64ffce75eb9373e4e27ab20ff163686c2aa4b49 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Mon, 25 Dec 2023 18:06:10 +0200 Subject: [PATCH 14/35] dts: veyron: bluetooth: disable dma on uart0 @@ -1354,7 +1354,7 @@ https://codeberg.org/petms/linux-veyron-patches-and-apkbuild 1 file changed, 2 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index 1cfa4eda5abf9..bba671f0de4fb 100644 +index 1cfa4eda5abf..bba671f0de4f 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -378,8 +378,6 @@ @@ -1370,7 +1370,7 @@ index 1cfa4eda5abf9..bba671f0de4fb 100644 2.44.0 -From 64d332d23b80d38af27a1bb0a56574c84ccf90b5 Mon Sep 17 00:00:00 2001 +From 15f5cdffa92d4363e6bb1576c04ca9e0c7824380 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Mon, 23 Oct 2023 17:37:14 +0000 Subject: [PATCH 15/35] drm/fourcc: Add NV20 and NV30 YUV formats @@ -1401,7 +1401,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231023173718.188102-2-jona 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c -index 0f17dfa8702b4..193cf8ed79128 100644 +index 0f17dfa8702b..193cf8ed7912 100644 --- a/drivers/gpu/drm/drm_fourcc.c +++ b/drivers/gpu/drm/drm_fourcc.c @@ -299,6 +299,14 @@ const struct drm_format_info *__drm_format_info(u32 format) @@ -1420,7 +1420,7 @@ index 0f17dfa8702b4..193cf8ed79128 100644 .num_planes = 3, .char_per_block = { 2, 2, 2 }, .block_w = { 1, 1, 1 }, .block_h = { 1, 1, 1 }, .hsub = 1, diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h -index 5eed091d4c291..6d6a8686c8daf 100644 +index 5eed091d4c29..6d6a8686c8da 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -323,6 +323,8 @@ extern "C" { @@ -1436,7 +1436,7 @@ index 5eed091d4c291..6d6a8686c8daf 100644 2.44.0 -From 2946acaf41e2658aba00813d3bc023571f579f6a Mon Sep 17 00:00:00 2001 +From 3c792db3629e78b6a2c49aecd48ed2526094095a Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Mon, 23 Oct 2023 17:37:15 +0000 Subject: [PATCH 16/35] drm/rockchip: vop: Add NV15, NV20 and NV30 support @@ -1464,7 +1464,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20231023173718.188102-3-jona 3 files changed, 86 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index a34d3fc662489..3f2ded6c032db 100644 +index a34d3fc66248..3f2ded6c032d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -280,6 +280,18 @@ static bool has_uv_swapped(uint32_t format) @@ -1548,7 +1548,7 @@ index a34d3fc662489..3f2ded6c032db 100644 dma_addr = rk_uv_obj->dma_addr + offset + fb->offsets[1]; VOP_WIN_SET(vop, win, uv_vir, DIV_ROUND_UP(fb->pitches[1], 4)); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h -index 4ea369e004a91..0cf512cc16144 100644 +index 4ea369e004a9..0cf512cc1614 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -187,6 +187,7 @@ struct vop_win_phy { @@ -1560,7 +1560,7 @@ index 4ea369e004a91..0cf512cc16144 100644 struct vop_reg uv_swap; struct vop_reg act_info; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index f7d0edd762b36..9f03f98ab66be 100644 +index f7d0edd762b3..9f03f98ab66b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -53,6 +53,26 @@ static const uint32_t formats_win_full[] = { @@ -1678,7 +1678,7 @@ index f7d0edd762b36..9f03f98ab66be 100644 2.44.0 -From 3fce50f4b30716f7fdc575845a3d1262fd11f3d8 Mon Sep 17 00:00:00 2001 +From 10d18b32e07ccbcf9e868f97062ca3a7a4e34bd8 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:00 +0000 Subject: [PATCH 17/35] media: v4l2-common: Add helpers to calculate @@ -1694,7 +1694,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c -index 3a4b15a98e021..834b426da8b13 100644 +index b37507e09339..34a9f0bb93b7 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -350,6 +350,34 @@ static inline unsigned int v4l2_format_block_height(const struct v4l2_format_inf @@ -1808,7 +1808,7 @@ index 3a4b15a98e021..834b426da8b13 100644 2.44.0 -From d321a49fdbff12417bb020a07dd310fb1bb61e7f Mon Sep 17 00:00:00 2001 +From bd478d334c95f2542487044f4fb3a8c813ee9456 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:01 +0000 Subject: [PATCH 18/35] media: v4l2: Add NV15 and NV20 pixel formats @@ -1836,7 +1836,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 4 files changed, 134 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst b/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst -index 1840224faa412..4366cdcb970e9 100644 +index 1840224faa41..4366cdcb970e 100644 --- a/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst +++ b/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst @@ -79,6 +79,13 @@ All components are stored with the same number of bits per component. @@ -1996,7 +1996,7 @@ index 1840224faa412..4366cdcb970e9 100644 .. _V4L2-PIX-FMT-NV42: diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c -index 834b426da8b13..c65ffab5800af 100644 +index 34a9f0bb93b7..f1708d1c1584 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -270,8 +270,10 @@ const struct v4l2_format_info *v4l2_format_info(u32 format) @@ -2011,7 +2011,7 @@ index 834b426da8b13..c65ffab5800af 100644 { .format = V4L2_PIX_FMT_NV42, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, { .format = V4L2_PIX_FMT_P010, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 2, 2, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 2, .vdiv = 1 }, diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index f4d9d62790940..a30d66f004c26 100644 +index f4d9d6279094..a30d66f004c2 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1347,8 +1347,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -2026,7 +2026,7 @@ index f4d9d62790940..a30d66f004c26 100644 case V4L2_PIX_FMT_NV42: descr = "Y/VU 4:4:4"; break; case V4L2_PIX_FMT_P010: descr = "10-bit Y/UV 4:2:0"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 78260e5d9985f..79b5ef45605cd 100644 +index 78260e5d9985..79b5ef45605c 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -638,8 +638,10 @@ struct v4l2_pix_format { @@ -2044,7 +2044,7 @@ index 78260e5d9985f..79b5ef45605cd 100644 2.44.0 -From 8ef0504fe66e21d7fb3353237fed27c4c436d99d Mon Sep 17 00:00:00 2001 +From 56961710aeb4e57657afc094bd28d3a60847572b Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:02 +0000 Subject: [PATCH 19/35] media: rkvdec: h264: Use bytesperline and buffer height @@ -2062,7 +2062,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c -index 4fc167b42cf0c..7a1e76d423df5 100644 +index 4fc167b42cf0..7a1e76d423df 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -896,9 +896,9 @@ static void config_registers(struct rkvdec_ctx *ctx, @@ -2103,7 +2103,7 @@ index 4fc167b42cf0c..7a1e76d423df5 100644 2.44.0 -From aa21aa187ef675c6e5b3d2b1523d15c0d8abba43 Mon Sep 17 00:00:00 2001 +From 5f826262458009e3c65ca6fe8662a52c6876af64 Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 16:55:03 +0000 Subject: [PATCH 20/35] media: rkvdec: h264: Don't hardcode SPS/PPS parameters @@ -2121,7 +2121,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c -index 7a1e76d423df5..8bce8902b8dda 100644 +index 7a1e76d423df..8bce8902b8dd 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -655,13 +655,14 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx, @@ -2158,7 +2158,7 @@ index 7a1e76d423df5..8bce8902b8dda 100644 2.44.0 -From 57c6fed2db4ed9dbf60b9ee8db07ddfcf0a66fed Mon Sep 17 00:00:00 2001 +From 1eef73fd1a68d76bf673938b4f7195588e6de16f Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:04 +0000 Subject: [PATCH 21/35] media: rkvdec: h264: Remove SPS validation at streaming @@ -2176,7 +2176,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c -index 8bce8902b8dda..815d5359ddd5c 100644 +index 8bce8902b8dd..815d5359ddd5 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -1070,17 +1070,6 @@ static int rkvdec_h264_start(struct rkvdec_ctx *ctx) @@ -2223,7 +2223,7 @@ index 8bce8902b8dda..815d5359ddd5c 100644 2.44.0 -From 9f8ef32a15040c0d0986022389a3727f3ee31eac Mon Sep 17 00:00:00 2001 +From 4a12d99e5e389fd21c084b0e6b23116d15c4d1f1 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:05 +0000 Subject: [PATCH 22/35] media: rkvdec: Extract rkvdec_fill_decoded_pixfmt into @@ -2238,7 +2238,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index a1d941b0be00b..364ef518c93ef 100644 +index a1d941b0be00..364ef518c93e 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,16 @@ @@ -2293,7 +2293,7 @@ index a1d941b0be00b..364ef518c93ef 100644 2.44.0 -From 8f3f0edd77ed46b79fd9aa3c76cfe7eb502e8721 Mon Sep 17 00:00:00 2001 +From ca0f7d716fefd639fd88cff478e204ce9a513683 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:06 +0000 Subject: [PATCH 23/35] media: rkvdec: Move rkvdec_reset_decoded_fmt helper @@ -2307,7 +2307,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 364ef518c93ef..056f5d8e23900 100644 +index 364ef518c93e..056f5d8e2390 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -37,6 +37,29 @@ static void rkvdec_fill_decoded_pixfmt(struct rkvdec_ctx *ctx, @@ -2381,7 +2381,7 @@ index 364ef518c93ef..056f5d8e23900 100644 2.44.0 -From b44657872244ac5df3868f84a894e986cda96eb0 Mon Sep 17 00:00:00 2001 +From b68f9423cd0bd22f0fee70efc537ffb688a4a8f1 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:07 +0000 Subject: [PATCH 24/35] media: rkvdec: Extract decoded format enumeration into @@ -2400,7 +2400,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 056f5d8e23900..56bae701d95f6 100644 +index 056f5d8e2390..56bae701d95f 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,32 @@ @@ -2495,7 +2495,7 @@ index 056f5d8e23900..56bae701d95f6 100644 2.44.0 -From 1e7682682b76aeef9de581c731bfeea65cb59521 Mon Sep 17 00:00:00 2001 +From ceaceaf042f97638b3ead83d613ae1a42e29564b Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:08 +0000 Subject: [PATCH 25/35] media: rkvdec: Add image format concept @@ -2513,7 +2513,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 56bae701d95f6..f55ca5409ec1b 100644 +index 56bae701d95f..f55ca5409ec1 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,26 +27,42 @@ @@ -2618,7 +2618,7 @@ index 56bae701d95f6..f55ca5409ec1b 100644 return -EINVAL; diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index 633335ebb9c49..6f8cf50c5d99a 100644 +index 633335ebb9c4..6f8cf50c5d99 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -75,13 +75,23 @@ struct rkvdec_coded_fmt_ops { @@ -2658,7 +2658,7 @@ index 633335ebb9c49..6f8cf50c5d99a 100644 2.44.0 -From 2d407ebccd2a07629b86f10499039b384b1eae93 Mon Sep 17 00:00:00 2001 +From 77084d07f07c8c063e5f4ab6385ffe60d99be4a2 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:09 +0000 Subject: [PATCH 26/35] media: rkvdec: Add get_image_fmt ops @@ -2676,7 +2676,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index f55ca5409ec1b..92f4677aae7f4 100644 +index f55ca5409ec1..92f4677aae7f 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -108,15 +108,60 @@ static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl) @@ -2743,7 +2743,7 @@ index f55ca5409ec1b..92f4677aae7f4 100644 static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index 6f8cf50c5d99a..e466a2753ccfc 100644 +index 6f8cf50c5d99..e466a2753ccf 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -73,6 +73,8 @@ struct rkvdec_coded_fmt_ops { @@ -2759,7 +2759,7 @@ index 6f8cf50c5d99a..e466a2753ccfc 100644 2.44.0 -From 788fd0f4c5b65f9eb224fec1894664e68bb39b9d Mon Sep 17 00:00:00 2001 +From 42fd158326145dbf3a207e270dae186a06acb736 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:10 +0000 Subject: [PATCH 27/35] media: rkvdec: h264: Support High 10 and 4:2:2 profiles @@ -2789,7 +2789,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 3 files changed, 57 insertions(+), 16 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c -index 815d5359ddd5c..baac6d012dddf 100644 +index 815d5359ddd5..baac6d012ddd 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -1027,24 +1027,42 @@ static int rkvdec_h264_adjust_fmt(struct rkvdec_ctx *ctx, @@ -2851,7 +2851,7 @@ index 815d5359ddd5c..baac6d012dddf 100644 + .get_image_fmt = rkvdec_h264_get_image_fmt, }; diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 92f4677aae7f4..595af0cb434bf 100644 +index 92f4677aae7f..595af0cb434b 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -73,7 +73,7 @@ static void rkvdec_fill_decoded_pixfmt(struct rkvdec_ctx *ctx, @@ -2934,7 +2934,7 @@ index 92f4677aae7f4..595af0cb434bf 100644 }; diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index e466a2753ccfc..9a9f4fced7a18 100644 +index e466a2753ccf..9a9f4fced7a1 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -80,6 +80,9 @@ struct rkvdec_coded_fmt_ops { @@ -2951,7 +2951,7 @@ index e466a2753ccfc..9a9f4fced7a18 100644 2.44.0 -From 51886c8ad75b4faaaec82e2f27e904f28fb6db98 Mon Sep 17 00:00:00 2001 +From 8bfbdf6648f79e877478e15de5825c05b1a35cd0 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 23:36:08 +0000 Subject: [PATCH 28/35] media: rkvdec: Add HEVC backend @@ -2978,7 +2978,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> create mode 100644 drivers/staging/media/rkvdec/rkvdec-hevc.c diff --git a/drivers/staging/media/rkvdec/Makefile b/drivers/staging/media/rkvdec/Makefile -index cb86b429cfaac..a77122641d141 100644 +index cb86b429cfaa..a77122641d14 100644 --- a/drivers/staging/media/rkvdec/Makefile +++ b/drivers/staging/media/rkvdec/Makefile @@ -1,3 +1,3 @@ @@ -2987,7 +2987,7 @@ index cb86b429cfaac..a77122641d141 100644 -rockchip-vdec-y += rkvdec.o rkvdec-h264.o rkvdec-vp9.o +rockchip-vdec-y += rkvdec.o rkvdec-h264.o rkvdec-hevc.o rkvdec-vp9.o diff --git a/drivers/staging/media/rkvdec/TODO b/drivers/staging/media/rkvdec/TODO -index 2c0779383276e..f089ef859e8c5 100644 +index 2c0779383276..f089ef859e8c 100644 --- a/drivers/staging/media/rkvdec/TODO +++ b/drivers/staging/media/rkvdec/TODO @@ -1,10 +1,3 @@ @@ -3003,7 +3003,7 @@ index 2c0779383276e..f089ef859e8c5 100644 The helper needs to the driver private data associated with diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc-data.c b/drivers/staging/media/rkvdec/rkvdec-hevc-data.c new file mode 100644 -index 0000000000000..eac4ea604949f +index 000000000000..eac4ea604949 --- /dev/null +++ b/drivers/staging/media/rkvdec/rkvdec-hevc-data.c @@ -0,0 +1,1848 @@ @@ -4857,7 +4857,7 @@ index 0000000000000..eac4ea604949f +}; diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c new file mode 100644 -index 0000000000000..0c4ddc073a6c8 +index 000000000000..0c4ddc073a6c --- /dev/null +++ b/drivers/staging/media/rkvdec/rkvdec-hevc.c @@ -0,0 +1,814 @@ @@ -5676,7 +5676,7 @@ index 0000000000000..0c4ddc073a6c8 + .get_image_fmt = rkvdec_hevc_get_image_fmt, +}; diff --git a/drivers/staging/media/rkvdec/rkvdec-regs.h b/drivers/staging/media/rkvdec/rkvdec-regs.h -index 15b9bee92016c..83bf790ed9b7d 100644 +index 15b9bee92016..83bf790ed9b7 100644 --- a/drivers/staging/media/rkvdec/rkvdec-regs.h +++ b/drivers/staging/media/rkvdec/rkvdec-regs.h @@ -43,6 +43,7 @@ @@ -5688,7 +5688,7 @@ index 15b9bee92016c..83bf790ed9b7d 100644 #define RKVDEC_MODE_VP9 2 #define RKVDEC_RPS_MODE BIT(24) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 595af0cb434bf..018f066a2b395 100644 +index 595af0cb434b..018f066a2b39 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -164,6 +164,67 @@ static const struct v4l2_ctrl_ops rkvdec_ctrl_ops = { @@ -5782,7 +5782,7 @@ index 595af0cb434bf..018f066a2b395 100644 .fourcc = V4L2_PIX_FMT_H264_SLICE, .frmsize = { diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index 9a9f4fced7a18..2f3bda1df5f07 100644 +index 9a9f4fced7a1..2f3bda1df5f0 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -138,6 +138,7 @@ void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run); @@ -5797,7 +5797,7 @@ index 9a9f4fced7a18..2f3bda1df5f07 100644 2.44.0 -From 27631d75cae7af4643fe9ab2c9e2c5d959adc64a Mon Sep 17 00:00:00 2001 +From a3e72d5bec4741956b9e3a876d9642bdf5c751e5 Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:09 +0000 Subject: [PATCH 29/35] media: rkvdec: Add variants support @@ -5816,7 +5816,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 018f066a2b395..cbef237af5e0e 100644 +index 018f066a2b39..cbef237af5e0 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -13,6 +13,7 @@ @@ -5894,7 +5894,7 @@ index 018f066a2b395..cbef237af5e0e 100644 INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec_watchdog_func); diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index 2f3bda1df5f07..14ce26a6c6186 100644 +index 2f3bda1df5f0..14ce26a6c618 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -22,6 +22,10 @@ @@ -5939,7 +5939,7 @@ index 2f3bda1df5f07..14ce26a6c6186 100644 2.44.0 -From 36bd20c9640a9815d7b36b62ffeb8b195fa1d42f Mon Sep 17 00:00:00 2001 +From 28b8df0af40b70dfb5e4fb5b0ee7e7060422f1c3 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 23:36:10 +0000 Subject: [PATCH 30/35] media: rkvdec: Implement capability filtering @@ -5954,7 +5954,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index cbef237af5e0e..c7fefc26ea83d 100644 +index cbef237af5e0..c7fefc26ea83 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -370,13 +370,34 @@ static const struct rkvdec_coded_fmt_desc rkvdec_coded_fmts[] = { @@ -6087,7 +6087,7 @@ index cbef237af5e0e..c7fefc26ea83d 100644 2.44.0 -From 0d95b46293cd53ef63beb05112b36e4554023f6a Mon Sep 17 00:00:00 2001 +From da36275b30652fe4e1ebeea728d9f57800dd8845 Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:11 +0000 Subject: [PATCH 31/35] media: rkvdec: Add RK3288 variant @@ -6102,7 +6102,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 8 insertions(+) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index c7fefc26ea83d..d179f48ca91a5 100644 +index c7fefc26ea83..d179f48ca91a 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -1209,6 +1209,10 @@ static void rkvdec_watchdog_func(struct work_struct *work) @@ -6131,7 +6131,7 @@ index c7fefc26ea83d..d179f48ca91a5 100644 2.44.0 -From 57616551ec3d21bf6b733f97c7f7c3979fbfc758 Mon Sep 17 00:00:00 2001 +From 52de8a3da62973975a65b0048720d5fbfc43e50c Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:12 +0000 Subject: [PATCH 32/35] media: rkvdec: Disable QoS for HEVC and VP9 on RK3328 @@ -6153,7 +6153,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 5 files changed, 37 insertions(+) diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c -index 0c4ddc073a6c8..d0a1859d54c12 100644 +index 0c4ddc073a6c..d0a1859d54c1 100644 --- a/drivers/staging/media/rkvdec/rkvdec-hevc.c +++ b/drivers/staging/media/rkvdec/rkvdec-hevc.c @@ -788,6 +788,15 @@ static int rkvdec_hevc_run(struct rkvdec_ctx *ctx) @@ -6173,7 +6173,7 @@ index 0c4ddc073a6c8..d0a1859d54c12 100644 writel(RKVDEC_INTERRUPT_DEC_E | RKVDEC_CONFIG_DEC_CLK_GATE_E | RKVDEC_TIMEOUT_E | RKVDEC_BUF_EMPTY_E, diff --git a/drivers/staging/media/rkvdec/rkvdec-regs.h b/drivers/staging/media/rkvdec/rkvdec-regs.h -index 83bf790ed9b7d..740bdb4986340 100644 +index 83bf790ed9b7..740bdb498634 100644 --- a/drivers/staging/media/rkvdec/rkvdec-regs.h +++ b/drivers/staging/media/rkvdec/rkvdec-regs.h @@ -218,6 +218,8 @@ @@ -6186,7 +6186,7 @@ index 83bf790ed9b7d..740bdb4986340 100644 #define RKVDEC_REG_PREF_CHR_CACHE_COMMAND 0x450 diff --git a/drivers/staging/media/rkvdec/rkvdec-vp9.c b/drivers/staging/media/rkvdec/rkvdec-vp9.c -index 0e7e16f20eeb0..cadb9d5923089 100644 +index 0e7e16f20eeb..cadb9d592308 100644 --- a/drivers/staging/media/rkvdec/rkvdec-vp9.c +++ b/drivers/staging/media/rkvdec/rkvdec-vp9.c @@ -824,6 +824,16 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx) @@ -6207,7 +6207,7 @@ index 0e7e16f20eeb0..cadb9d5923089 100644 writel(RKVDEC_INTERRUPT_DEC_E | RKVDEC_CONFIG_DEC_CLK_GATE_E | RKVDEC_TIMEOUT_E | RKVDEC_BUF_EMPTY_E, diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index d179f48ca91a5..c2bf37d38a3db 100644 +index d179f48ca91a..c2bf37d38a3d 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -1213,6 +1213,13 @@ static const struct rkvdec_variant rk3288_rkvdec_variant = { @@ -6244,7 +6244,7 @@ index d179f48ca91a5..c2bf37d38a3db 100644 INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec_watchdog_func); diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index 14ce26a6c6186..1d5d405da56cb 100644 +index 14ce26a6c618..1d5d405da56c 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -26,6 +26,8 @@ @@ -6276,7 +6276,7 @@ index 14ce26a6c6186..1d5d405da56cb 100644 2.44.0 -From 09e6f1a3700078bf3b5dc427f491b0f5666d74f4 Mon Sep 17 00:00:00 2001 +From c1586c13e1bd0e317d561e616e43865ad458661e Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 23:36:13 +0000 Subject: [PATCH 33/35] media: dt-bindings: rockchip,vdec: Add RK3288 @@ -6291,7 +6291,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml -index 08b02ec167557..0f00e9c86737a 100644 +index 08b02ec16755..0f00e9c86737 100644 --- a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml +++ b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml @@ -16,7 +16,9 @@ description: |- @@ -6309,7 +6309,7 @@ index 08b02ec167557..0f00e9c86737a 100644 2.44.0 -From 876aa077a462d368d30e5f6cd032c0e1d59e4f45 Mon Sep 17 00:00:00 2001 +From 9075457e96c21cbb1516582b27dede2d707ef944 Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:14 +0000 Subject: [PATCH 34/35] ARM: dts: rockchip: Add vdec node for RK3288 @@ -6324,7 +6324,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se> 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index bba671f0de4fb..9065650080c1f 100644 +index bba671f0de4f..9065650080c1 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -1287,6 +1287,21 @@ @@ -6362,7 +6362,7 @@ index bba671f0de4fb..9065650080c1f 100644 2.44.0 -From 875eef873de1a33a64325a08d5419acea2e6474c Mon Sep 17 00:00:00 2001 +From f39fd9c289e2200335b30d295cec70c3e993cfda Mon Sep 17 00:00:00 2001 From: "Urja (ARMLFS builder)" <urja+armlfs@urja.dev> Date: Wed, 24 Jul 2024 00:06:43 +0300 Subject: [PATCH 35/35] mfd: rk8xx: workaround veyron/ASUS C201 not powering @@ -6377,7 +6377,7 @@ done in power_off (pm_power_off) pre-6.4 anyways. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c -index a577f950c6324..c75ce0a9b56e1 100644 +index a577f950c632..c75ce0a9b56e 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c @@ -679,7 +679,7 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap