| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-06-17 15:45:40 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-06-17 15:45:40 UTC |
| parent | 683771c748fd2231057d341e35c4f7d36588aa17 |
| .SRCINFO | +4 | -4 |
| PKGBUILD | +3 | -3 |
| armlfs.patch | +96 | -96 |
diff --git a/.SRCINFO b/.SRCINFO index 86c8fa7..5c3ae03 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = linux-armlfs-lts - pkgver = 6.6.91 + pkgver = 6.6.93 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.91.xz + source = https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.6.93.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 = a304a814d58648b64c443874158692db8fe039cb8726b3f92913d42532fca083 - sha256sums = e6fa969281430c90dbe570ab2f14bfd9f29f54006e4aa3c4f4305d9795094078 + sha256sums = 5cf8db0daba2311c9dc3cfe95d7895e7217896520c49927f6e3dd2b6538b81f1 + sha256sums = a7593467d331fde3fb5b09d45e957ee85a99cf80025c72c73ba02ba1299a38ff sha256sums = 91c73d902368f464c64626128932220a5ca7d26f7ac25eec00c1865810c51173 sha256sums = 4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb sha256sums = bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b diff --git a/PKGBUILD b/PKGBUILD index a889111..4b2150e 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.91 +pkgver=6.6.93 pkgrel=1 arch=('armv7h') url="http://www.kernel.org/" @@ -169,8 +169,8 @@ for _p in ${pkgname[@]}; do done sha256sums=('d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0' - 'a304a814d58648b64c443874158692db8fe039cb8726b3f92913d42532fca083' - 'e6fa969281430c90dbe570ab2f14bfd9f29f54006e4aa3c4f4305d9795094078' + '5cf8db0daba2311c9dc3cfe95d7895e7217896520c49927f6e3dd2b6538b81f1' + 'a7593467d331fde3fb5b09d45e957ee85a99cf80025c72c73ba02ba1299a38ff' '91c73d902368f464c64626128932220a5ca7d26f7ac25eec00c1865810c51173' '4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb' 'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b' diff --git a/armlfs.patch b/armlfs.patch index 1c6d53b..5423da2 100644 --- a/armlfs.patch +++ b/armlfs.patch @@ -1,4 +1,4 @@ -From 97bb7e157c87038b6a54f28568abf7aa66b5d09d Mon Sep 17 00:00:00 2001 +From ff1a274d8490e45868755acbf258efd4ea3654fc 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 baa5aebd3277..11493f0be2b1 100644 +index baa5aebd32771..11493f0be2b1d 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 baa5aebd3277..11493f0be2b1 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 758ebaf2236b..7ee324e4186f 100644 +index 758ebaf2236bf..7ee324e4186fb 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 758ebaf2236b..7ee324e4186f 100644 2.44.0 -From 6f15e46a1250d1e9f824297453d322bb20b15e4a Mon Sep 17 00:00:00 2001 +From c9f5021df13fd7892e5fe167970f71d65291473d 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 aae48e906af1..81f8a82aa5d4 100644 +index aae48e906af11..81f8a82aa5d46 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 aae48e906af1..81f8a82aa5d4 100644 2.44.0 -From 5a85fd9e8a79cdc240a28e6b750dba1694b4de4d Mon Sep 17 00:00:00 2001 +From 74c5f6130d6254fc736cc6285b14c2147d1d7561 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 8593a8359937..1cfa4eda5abf 100644 +index 8593a83599376..1cfa4eda5abf9 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 8593a8359937..1cfa4eda5abf 100644 2.44.0 -From f46d284e8ab5eb1102e450ac4b3a591578173a3e Mon Sep 17 00:00:00 2001 +From 778bafbd20896bc0b3c61f872c04ddc6690a4913 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 092316be67f7..e4d5c0240657 100644 +index 092316be67f74..e4d5c02406579 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 092316be67f7..e4d5c0240657 100644 2.44.0 -From 3b231b3b6e2ce1b7ea05ad83e5164263a0bff08a Mon Sep 17 00:00:00 2001 +From 2611eabe108277abd922d695d491434adfa95f71 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 3564a0f63c9c..fbfc5c628f14 100644 +index 3564a0f63c9c7..fbfc5c628f144 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 3564a0f63c9c..fbfc5c628f14 100644 2.44.0 -From 29f57fb4c92c386e42f31bce1410f55388ae1df9 Mon Sep 17 00:00:00 2001 +From 36c01b237784dcb8a3f7345fac3c6b93fceb7690 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 7acba66eed48..087032a4705e 100644 +index 7acba66eed481..087032a4705e7 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 7acba66eed48..087032a4705e 100644 } diff --git a/block/partitions/efi.h b/block/partitions/efi.h -index 84b9f36b9e47..09726227e891 100644 +index 84b9f36b9e479..09726227e8913 100644 --- a/block/partitions/efi.h +++ b/block/partitions/efi.h @@ -26,7 +26,8 @@ @@ -955,7 +955,7 @@ index 84b9f36b9e47..09726227e891 100644 2.44.0 -From fd5189a8afbea6c98a07bee23dcdc1a91d723f1e Mon Sep 17 00:00:00 2001 +From cd9c4688e40c2be4e683f741c703ebccfb216532 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 cf396e8f34e9..135cba5d5aa3 100644 +index cf396e8f34e98..135cba5d5aa39 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 cf396e8f34e9..135cba5d5aa3 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 7e39017e440f..a8406756299d 100644 +index 7e39017e440fb..a8406756299d9 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 7e39017e440f..a8406756299d 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 62a6847a3b6f..d80cc06fa2c6 100644 +index 62a6847a3b6f0..d80cc06fa2c6e 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 62a6847a3b6f..d80cc06fa2c6 100644 2.44.0 -From 6ebac7857767842c1fbea7ca8455ee18f56f38bf Mon Sep 17 00:00:00 2001 +From 7fd603e51a94df2d1c1781a757173448fd51e1ed 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 d838bf0d5d9a..7aeb70e9b828 100644 +index d838bf0d5d9a0..7aeb70e9b828b 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 d838bf0d5d9a..7aeb70e9b828 100644 2.44.0 -From fa8ddc64807f5d24501539f2ea140d693d79e0d2 Mon Sep 17 00:00:00 2001 +From f4c68f344f8d4e046c442f7f4b612fc637ca3755 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 0d4495c6b9f7..3444cfd35840 100644 +index 0d4495c6b9f7b..3444cfd358404 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 0d4495c6b9f7..3444cfd35840 100644 2.44.0 -From 3ccff37f1a0945b57c9c4c5ae23812f7320cd905 Mon Sep 17 00:00:00 2001 +From 80454fa8c8c63830d101834a0a89b495a4018ff2 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 c1de38de2806..79ad20b3f863 100644 +index c1de38de28061..79ad20b3f863e 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 c1de38de2806..79ad20b3f863 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 5c7538d498dd..96dc5d8115d2 100644 +index 5c7538d498dd1..96dc5d8115d2c 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 5c7538d498dd..96dc5d8115d2 100644 2.44.0 -From c2fc3fef8d91cca17264063f92c7458e372c9679 Mon Sep 17 00:00:00 2001 +From 433fb5e0f56ed4a1a5bad0cce579d84c0de9c937 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 94fe2f3836a9..9a9e19fd1fb3 100644 +index 53b3b24d7d7c0..dd6fdd3d45891 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 94fe2f3836a9..9a9e19fd1fb3 100644 2.44.0 -From 87c1014a3accad380b79ec4765861b1a170e1ae0 Mon Sep 17 00:00:00 2001 +From 7365a29908b3ba92d37cdc038cb46b2d6af5add4 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 32c0f10765dd..ea20818202fc 100644 +index 32c0f10765dd3..ea20818202fce 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 32c0f10765dd..ea20818202fc 100644 2.44.0 -From ea87002bd67df1a1cb49ceb0deaf9e2b15317504 Mon Sep 17 00:00:00 2001 +From 4819890104eb7f6f43f44f66a76ddb4d94c96f7b 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 a2c2b5203b0a..9a63a0447d6f 100644 +index a2c2b5203b0a9..9a63a0447d6fe 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 a2c2b5203b0a..9a63a0447d6f 100644 2.44.0 -From abec3b754a2d53e9da071d57d963b3781299d2ab Mon Sep 17 00:00:00 2001 +From 10253249db862cd651cdc321ed34283c0c925828 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 1cfa4eda5abf..bba671f0de4f 100644 +index 1cfa4eda5abf9..bba671f0de4fb 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 1cfa4eda5abf..bba671f0de4f 100644 2.44.0 -From cda9cee62ce39da9d5ad7f7498728b8fc8282a2a Mon Sep 17 00:00:00 2001 +From da97cc07a6afb85e5ac5249ac9d98c20238c58ee 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 0f17dfa8702b..193cf8ed7912 100644 +index 0f17dfa8702b4..193cf8ed79128 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 0f17dfa8702b..193cf8ed7912 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 5eed091d4c29..6d6a8686c8da 100644 +index 5eed091d4c291..6d6a8686c8daf 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 5eed091d4c29..6d6a8686c8da 100644 2.44.0 -From 3d8511a21b1ef28f2af07411f1c53c12d5206fde Mon Sep 17 00:00:00 2001 +From 28ffade18a2a02541e097acbb47d2a9c4586830d 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 a34d3fc66248..3f2ded6c032d 100644 +index a34d3fc662489..3f2ded6c032db 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 a34d3fc66248..3f2ded6c032d 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 4ea369e004a9..0cf512cc1614 100644 +index 4ea369e004a91..0cf512cc16144 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 4ea369e004a9..0cf512cc1614 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 f7d0edd762b3..9f03f98ab66b 100644 +index f7d0edd762b36..9f03f98ab66be 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 f7d0edd762b3..9f03f98ab66b 100644 2.44.0 -From 8baa458433bb348722c0ef378680fecb28b11be6 Mon Sep 17 00:00:00 2001 +From 141829fe9b9e829a9f73bf899c2adf1412ad2c25 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 3a4b15a98e02..834b426da8b1 100644 +index 3a4b15a98e021..834b426da8b13 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 3a4b15a98e02..834b426da8b1 100644 2.44.0 -From f6faa66b7024178ba341290030b51ed0daaa17cd Mon Sep 17 00:00:00 2001 +From fc51f6ced38f4895d9790470f53437f5e3ae2b65 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 1840224faa41..4366cdcb970e 100644 +index 1840224faa412..4366cdcb970e9 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 1840224faa41..4366cdcb970e 100644 .. _V4L2-PIX-FMT-NV42: diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c -index 834b426da8b1..c65ffab5800a 100644 +index 834b426da8b13..c65ffab5800af 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 834b426da8b1..c65ffab5800a 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 f4d9d6279094..a30d66f004c2 100644 +index f4d9d62790940..a30d66f004c26 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 f4d9d6279094..a30d66f004c2 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 78260e5d9985..79b5ef45605c 100644 +index 78260e5d9985f..79b5ef45605cd 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 78260e5d9985..79b5ef45605c 100644 2.44.0 -From d93d4830c69601c1d97acbda39ce71a3e9afe219 Mon Sep 17 00:00:00 2001 +From f08cfe5d65689861450658310da3595f1ac798c2 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 4fc167b42cf0..7a1e76d423df 100644 +index 4fc167b42cf0c..7a1e76d423df5 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 4fc167b42cf0..7a1e76d423df 100644 2.44.0 -From fa580e67f79da78a4177e4d71d53b8417e42742b Mon Sep 17 00:00:00 2001 +From 82bf0d13add6085fb8df6fdf5b0c00fae5a8bc58 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 7a1e76d423df..8bce8902b8dd 100644 +index 7a1e76d423df5..8bce8902b8dda 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 7a1e76d423df..8bce8902b8dd 100644 2.44.0 -From 8e21e3e518afcf663e8baad876e20f656ae52a6b Mon Sep 17 00:00:00 2001 +From 66d06b82f14350155c35b802ecd0a0a32895b350 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 8bce8902b8dd..815d5359ddd5 100644 +index 8bce8902b8dda..815d5359ddd5c 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 8bce8902b8dd..815d5359ddd5 100644 2.44.0 -From 2b2129becdbf0598326b0e9d6b7871fd94f1e9f5 Mon Sep 17 00:00:00 2001 +From 7c1b11ee7d598f56de539ada199b2924dc37077e 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 ac398b5a9736..d1087519d218 100644 +index ac398b5a97360..d1087519d2180 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,16 @@ @@ -2293,7 +2293,7 @@ index ac398b5a9736..d1087519d218 100644 2.44.0 -From 6f35119d4646a90d4234c1090d61c466915dd8da Mon Sep 17 00:00:00 2001 +From 41fa45805903fd9c7af288da12210a9e120f8d76 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 d1087519d218..7e59db3fc24d 100644 +index d1087519d2180..7e59db3fc24d1 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 d1087519d218..7e59db3fc24d 100644 2.44.0 -From d21ff426d79bb291fe9149b3f24771c19fa6976b Mon Sep 17 00:00:00 2001 +From c51a83671746174c311cc58e8ea7d4b08be0d75f 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 7e59db3fc24d..efbf9aa578ae 100644 +index 7e59db3fc24d1..efbf9aa578aee 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,32 @@ @@ -2495,7 +2495,7 @@ index 7e59db3fc24d..efbf9aa578ae 100644 2.44.0 -From f22db04b8bf65f6235da1611cd35a428118b2f06 Mon Sep 17 00:00:00 2001 +From c10dbb362971d73c080b6062eb4eb9b92e304145 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 efbf9aa578ae..d8fb2d935ffc 100644 +index efbf9aa578aee..d8fb2d935ffcf 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,26 +27,42 @@ @@ -2618,7 +2618,7 @@ index efbf9aa578ae..d8fb2d935ffc 100644 return -EINVAL; diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index 633335ebb9c4..6f8cf50c5d99 100644 +index 633335ebb9c49..6f8cf50c5d99a 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 633335ebb9c4..6f8cf50c5d99 100644 2.44.0 -From 200f813ca6133661fdf32ed645b5c5bd5d0f3438 Mon Sep 17 00:00:00 2001 +From 74fc45fd129c5f915ac41f4c151ae27308b3789a 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 d8fb2d935ffc..455b9cd34b6a 100644 +index d8fb2d935ffcf..455b9cd34b6ae 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 d8fb2d935ffc..455b9cd34b6a 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 6f8cf50c5d99..e466a2753ccf 100644 +index 6f8cf50c5d99a..e466a2753ccfc 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 6f8cf50c5d99..e466a2753ccf 100644 2.44.0 -From a3ee588df2173ed8f266c1c8413e3cbe2db90db9 Mon Sep 17 00:00:00 2001 +From 031242603bf79a9dd8ca7428f5b64ea15e78bc38 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 815d5359ddd5..baac6d012ddd 100644 +index 815d5359ddd5c..baac6d012dddf 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 815d5359ddd5..baac6d012ddd 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 455b9cd34b6a..7d909d4a5d00 100644 +index 455b9cd34b6ae..7d909d4a5d000 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 455b9cd34b6a..7d909d4a5d00 100644 }; diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index e466a2753ccf..9a9f4fced7a1 100644 +index e466a2753ccfc..9a9f4fced7a18 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 e466a2753ccf..9a9f4fced7a1 100644 2.44.0 -From 01e4e755fa19d766598dccb85eb93720da263ddb Mon Sep 17 00:00:00 2001 +From cacceb916a224201c8b01b3051919cf044ef6eed 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 cb86b429cfaa..a77122641d14 100644 +index cb86b429cfaac..a77122641d141 100644 --- a/drivers/staging/media/rkvdec/Makefile +++ b/drivers/staging/media/rkvdec/Makefile @@ -1,3 +1,3 @@ @@ -2987,7 +2987,7 @@ index cb86b429cfaa..a77122641d14 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 2c0779383276..f089ef859e8c 100644 +index 2c0779383276e..f089ef859e8c5 100644 --- a/drivers/staging/media/rkvdec/TODO +++ b/drivers/staging/media/rkvdec/TODO @@ -1,10 +1,3 @@ @@ -3003,7 +3003,7 @@ index 2c0779383276..f089ef859e8c 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 000000000000..eac4ea604949 +index 0000000000000..eac4ea604949f --- /dev/null +++ b/drivers/staging/media/rkvdec/rkvdec-hevc-data.c @@ -0,0 +1,1848 @@ @@ -4857,7 +4857,7 @@ index 000000000000..eac4ea604949 +}; diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c new file mode 100644 -index 000000000000..0c4ddc073a6c +index 0000000000000..0c4ddc073a6c8 --- /dev/null +++ b/drivers/staging/media/rkvdec/rkvdec-hevc.c @@ -0,0 +1,814 @@ @@ -5676,7 +5676,7 @@ index 000000000000..0c4ddc073a6c + .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 15b9bee92016..83bf790ed9b7 100644 +index 15b9bee92016c..83bf790ed9b7d 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 15b9bee92016..83bf790ed9b7 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 7d909d4a5d00..ca82ccda1825 100644 +index 7d909d4a5d000..ca82ccda1825e 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 7d909d4a5d00..ca82ccda1825 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 9a9f4fced7a1..2f3bda1df5f0 100644 +index 9a9f4fced7a18..2f3bda1df5f07 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 9a9f4fced7a1..2f3bda1df5f0 100644 2.44.0 -From fc3d942564b6ac87e04604161fdd7b68770256b5 Mon Sep 17 00:00:00 2001 +From 858d66ce09d5169a5a9c7a2f376334b55147c9dc 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 ca82ccda1825..768683747e8a 100644 +index ca82ccda1825e..768683747e8a3 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -13,6 +13,7 @@ @@ -5894,7 +5894,7 @@ index ca82ccda1825..768683747e8a 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 2f3bda1df5f0..14ce26a6c618 100644 +index 2f3bda1df5f07..14ce26a6c6186 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -22,6 +22,10 @@ @@ -5939,7 +5939,7 @@ index 2f3bda1df5f0..14ce26a6c618 100644 2.44.0 -From 5afd9cc9d5eb63a032c5869dbd8668174b755c16 Mon Sep 17 00:00:00 2001 +From 9f2890bfabe52c12e31a2549d819c08790cbb038 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, 46 insertions(+), 17 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 768683747e8a..6725c5f06d10 100644 +index 768683747e8a3..6725c5f06d10b 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[] = { @@ -6092,7 +6092,7 @@ index 768683747e8a..6725c5f06d10 100644 2.44.0 -From 7c8a508b79789dd549cc3e60be96de8abb7fad6e Mon Sep 17 00:00:00 2001 +From 9cc9ac65e0c5c052d77d797da6164efaf6acccbb 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 @@ -6107,7 +6107,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 6725c5f06d10..ba5812707e03 100644 +index 6725c5f06d10b..ba5812707e031 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -1203,6 +1203,10 @@ static void rkvdec_watchdog_func(struct work_struct *work) @@ -6136,7 +6136,7 @@ index 6725c5f06d10..ba5812707e03 100644 2.44.0 -From ebb08cbc119e043026c2ce305723844fd56fe765 Mon Sep 17 00:00:00 2001 +From c72f834d4b0b599dafe27c7931ccb990f8d2dbde 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 @@ -6158,7 +6158,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 0c4ddc073a6c..d0a1859d54c1 100644 +index 0c4ddc073a6c8..d0a1859d54c12 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) @@ -6178,7 +6178,7 @@ index 0c4ddc073a6c..d0a1859d54c1 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 83bf790ed9b7..740bdb498634 100644 +index 83bf790ed9b7d..740bdb4986340 100644 --- a/drivers/staging/media/rkvdec/rkvdec-regs.h +++ b/drivers/staging/media/rkvdec/rkvdec-regs.h @@ -218,6 +218,8 @@ @@ -6191,7 +6191,7 @@ index 83bf790ed9b7..740bdb498634 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 0e7e16f20eeb..cadb9d592308 100644 +index 0e7e16f20eeb0..cadb9d5923089 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) @@ -6212,7 +6212,7 @@ index 0e7e16f20eeb..cadb9d592308 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 ba5812707e03..e76a719e021c 100644 +index ba5812707e031..e76a719e021cd 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -1207,6 +1207,13 @@ static const struct rkvdec_variant rk3288_rkvdec_variant = { @@ -6249,7 +6249,7 @@ index ba5812707e03..e76a719e021c 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 14ce26a6c618..1d5d405da56c 100644 +index 14ce26a6c6186..1d5d405da56cb 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -26,6 +26,8 @@ @@ -6281,7 +6281,7 @@ index 14ce26a6c618..1d5d405da56c 100644 2.44.0 -From da80582bdd022afa1c18388438685235cfcb7741 Mon Sep 17 00:00:00 2001 +From b8555ac13576a64ff5fcea6a1f6035318568f5b8 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 @@ -6296,7 +6296,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 08b02ec16755..0f00e9c86737 100644 +index 08b02ec167557..0f00e9c86737a 100644 --- a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml +++ b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml @@ -16,7 +16,9 @@ description: |- @@ -6314,7 +6314,7 @@ index 08b02ec16755..0f00e9c86737 100644 2.44.0 -From 6560ba982ceb5ec76ba78db3c20e128f1c01cecd Mon Sep 17 00:00:00 2001 +From 78edb77b60ab7253316127658c93ac4e5b5e8a88 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 @@ -6329,7 +6329,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 bba671f0de4f..9065650080c1 100644 +index bba671f0de4fb..9065650080c1f 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -1287,6 +1287,21 @@ @@ -6367,7 +6367,7 @@ index bba671f0de4f..9065650080c1 100644 2.44.0 -From 126f202a90a86071c14b085ad9bd7502aeeacd07 Mon Sep 17 00:00:00 2001 +From 4a560c3a4e048aa57506f94dcbb6fd1fc10fa749 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 @@ -6382,7 +6382,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 a577f950c632..c75ce0a9b56e 100644 +index a577f950c6324..c75ce0a9b56e1 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