| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-06-17 15:45:36 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-06-17 15:45:36 UTC |
| parent | 9f65d7c9dcaf1575ac08de326cf667a134fa9642 |
| .SRCINFO | +6 | -6 |
| PKGBUILD | +5 | -5 |
| armlfs.patch | +199 | -130 |
diff --git a/.SRCINFO b/.SRCINFO index 20a6eee..63e7bdc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = linux-armlfs - pkgver = 6.14.7 + pkgver = 6.15.2 pkgrel = 1 url = http://www.kernel.org/ arch = armv7h @@ -14,17 +14,17 @@ pkgbase = linux-armlfs makedepends = vboot-utils makedepends = uboot-tools options = !strip - source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.14.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.14.7.xz + source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.15.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.15.2.xz source = armlfs.patch source = kernel.its source = kernel.keyblock source = kernel_data_key.vbprivk source = 60-linux.hook source = config - sha256sums = a294b683e7b161bb0517bb32ec7ed1d2ea7603dfbabad135170ed12d00c47670 - sha256sums = 632b8428077584316178b17ebf385336c6d769cdc3f79ac8f6f81db16ad64515 - sha256sums = 22a72573fdae2add2fd4c0e5b929b6c4cd4775c91aff03e516977a2c1a95b2cf + sha256sums = 7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764 + sha256sums = 0ff99b5765590b019579a61aaff35b7bb3d56deb7013653c45b7a3fb189fe9e3 + sha256sums = 30908b54a765e3a912abc8a471b3443afaf34fe99d615567290c72a673602959 sha256sums = 994aee74b13313bdc7c47df4d621c890f5ee52bc18f6c7b658de215c17423b2a sha256sums = 4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb sha256sums = bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b diff --git a/PKGBUILD b/PKGBUILD index 3ea7c88..f1d3511 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,10 +11,10 @@ buildarch=4 _xname= pkgbase=linux-armlfs${_xname} -_srcname=linux-6.14 +_srcname=linux-6.15 _kernelname=${pkgbase#linux} _desc="Veyron Speedy" -pkgver=6.14.7 +pkgver=6.15.2 pkgrel=1 arch=('armv7h') url="http://www.kernel.org/" @@ -167,9 +167,9 @@ for _p in ${pkgname[@]}; do }" done -sha256sums=('a294b683e7b161bb0517bb32ec7ed1d2ea7603dfbabad135170ed12d00c47670' - '632b8428077584316178b17ebf385336c6d769cdc3f79ac8f6f81db16ad64515' - '22a72573fdae2add2fd4c0e5b929b6c4cd4775c91aff03e516977a2c1a95b2cf' +sha256sums=('7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764' + '0ff99b5765590b019579a61aaff35b7bb3d56deb7013653c45b7a3fb189fe9e3' + '30908b54a765e3a912abc8a471b3443afaf34fe99d615567290c72a673602959' '994aee74b13313bdc7c47df4d621c890f5ee52bc18f6c7b658de215c17423b2a' '4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb' 'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b' diff --git a/armlfs.patch b/armlfs.patch index e68fa7d..ce35af5 100644 --- a/armlfs.patch +++ b/armlfs.patch @@ -1,7 +1,7 @@ -From 82dd2acd1b95467e0d46b7e9478d144960743e12 Mon Sep 17 00:00:00 2001 +From 74809e2723196b029e749fcb5ebab43df228b4be 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/33] drivers: clk-rk3288: support for dedicating NPLL to a +Subject: [PATCH 01/35] drivers: clk-rk3288: support for dedicating NPLL to a VOP As controlled by the just introduced dts property. @@ -13,7 +13,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com> 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c -index 90d329216064..671c786ddbaa 100644 +index 90d329216064a..671c786ddbaa1 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" }; @@ -153,10 +153,10 @@ index 90d329216064..671c786ddbaa 100644 pr_err("%s: rockchip clk init failed\n", __func__); iounmap(rk3288_cru_base); diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index 9b37d44b9e5d..91ee6dbec7ee 100644 +index df2b2d706450f..df85bd94647a8 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h -@@ -563,6 +563,9 @@ struct clk *rockchip_clk_register_muxgrf(const char *name, +@@ -624,6 +624,9 @@ struct clk *rockchip_clk_register_muxgrf(const char *name, #define PNAME(x) static const char *const x[] __initconst @@ -170,10 +170,10 @@ index 9b37d44b9e5d..91ee6dbec7ee 100644 2.44.0 -From 1cf2b8c9a29d730199eeffb2833de4467c6ba1f7 Mon Sep 17 00:00:00 2001 +From 170949368d896a28355513126232ac891432174d 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/33] drm: dw_hdmi-rockchip: better clock selection logic and +Subject: [PATCH 02/35] drm: dw_hdmi-rockchip: better clock selection logic and dts-based rate list This contains traces of the following commits from the ChromeOS 3.14 @@ -203,7 +203,7 @@ Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com> 1 file changed, 109 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -index f737e7d46e66..0bd62f21d6e5 100644 +index f737e7d46e667..0bd62f21d6e57 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -81,8 +81,13 @@ struct rockchip_hdmi { @@ -466,10 +466,10 @@ index f737e7d46e66..0bd62f21d6e5 100644 2.44.0 -From e4202fdc8d96c4db72a650b3b53a9fb6c78bbe34 Mon Sep 17 00:00:00 2001 +From 596dd3af6fd1577da20ff4b50be41b99d3c0d79b 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/33] dts: rk3288: support for dedicating npll to a vop +Subject: [PATCH 03/35] dts: rk3288: support for dedicating npll to a vop Add the VOP DCLKs to the assigned clocks list so their parents can be set in the dts include files for @@ -481,7 +481,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 3f1d640afafa..2992c323d555 100644 +index 3f1d640afafae..2992c323d5554 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -876,12 +876,14 @@ @@ -505,10 +505,10 @@ index 3f1d640afafa..2992c323d555 100644 2.44.0 -From 73e34f53e1c1e81cb7fc5013bd2cefde4222dc48 Mon Sep 17 00:00:00 2001 +From 383a0d74996367d7f772b73832d1840edf3a98f5 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/33] dts: rk3288-veyron-chromebook: dedicate npll to +Subject: [PATCH 04/35] dts: rk3288-veyron-chromebook: dedicate npll to VOP0/HDMI + HDMI rates This enables flexible HDMI rates on the rk3288 chromebooks so that they @@ -522,7 +522,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 3677571b4d82..b61a4b0d7015 100644 +index 3677571b4d827..b61a4b0d7015b 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 @@ @@ -598,10 +598,10 @@ index 3677571b4d82..b61a4b0d7015 100644 2.44.0 -From 19ad0ef92d836e4798140469ef367528bd101d44 Mon Sep 17 00:00:00 2001 +From da8b92235616e5ef11597dcf4401e23c1048a032 Mon Sep 17 00:00:00 2001 From: SolidHal <hal@halemmerich.com> Date: Sun, 21 Oct 2018 16:40:15 -0500 -Subject: [PATCH 05/33] Added a second reset when having an issue reading the +Subject: [PATCH 05/35] Added a second reset when having an issue reading the emmc. The c201 emmc can be... touchy. Sometimes one full reset isn't @@ -621,7 +621,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 4830628510e6..7658effcb6ef 100644 +index 4830628510e6e..7658effcb6efe 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1090,6 +1090,7 @@ static unsigned int mmc_blk_data_timeout_ms(struct mmc_host *host, @@ -651,10 +651,10 @@ index 4830628510e6..7658effcb6ef 100644 2.44.0 -From 06cc1302d0a5ca9e163dbb9489581bb865c5457d Mon Sep 17 00:00:00 2001 +From e20441d9db74d13d295f7dc815698c854583667c 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/33] block: partitions: efi: Ignore bizarre Chromebook GPT +Subject: [PATCH 06/35] block: partitions: efi: Ignore bizarre Chromebook GPT partitions This patch is based on @SolidHal work here : @@ -691,7 +691,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, @@ -787,7 +787,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 @@ @@ -804,10 +804,10 @@ index 84b9f36b9e47..09726227e891 100644 2.44.0 -From 74aeeec21427257be013a9ce2433536dff09864b Mon Sep 17 00:00:00 2001 +From 45081ec59595957178dd0ab3d6662dd0e9f9d90c 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/33] mmc: Added a flag to disable cache flush during reset +Subject: [PATCH 07/35] mmc: Added a flag to disable cache flush during reset The ASUS Chromebook suffer from 10 minutes long hang, when trying to flush the cache of the eMMC, in order to recover from eMMC init @@ -827,7 +827,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 bdb22998357e..f7d2db641408 100644 +index dacb5bd9bb714..04703ce624abe 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -405,6 +405,8 @@ int mmc_of_parse(struct mmc_host *host) @@ -840,10 +840,10 @@ index bdb22998357e..f7d2db641408 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 6a23be214543..d4701521f6b2 100644 +index 1522fd2b517dd..0a970bc258f23 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) +@@ -2242,6 +2242,12 @@ static int mmc_runtime_resume(struct mmc_host *host) return 0; } @@ -856,7 +856,7 @@ index 6a23be214543..d4701521f6b2 100644 static int mmc_can_reset(struct mmc_card *card) { u8 rst_n_function; -@@ -2252,11 +2258,15 @@ static int _mmc_hw_reset(struct mmc_host *host) +@@ -2256,11 +2262,15 @@ static int _mmc_hw_reset(struct mmc_host *host) { struct mmc_card *card = host->card; @@ -877,7 +877,7 @@ index 6a23be214543..d4701521f6b2 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 68f09a955a90..eb7dbf0f9b10 100644 +index 68f09a955a902..eb7dbf0f9b101 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -459,6 +459,7 @@ struct mmc_host { @@ -892,10 +892,10 @@ index 68f09a955a90..eb7dbf0f9b10 100644 2.44.0 -From eb3805a8cf31128ac037c30ca88433263736b44d Mon Sep 17 00:00:00 2001 +From f6cd2e8ed44fdd99391a97c6c47216f476a3a1e9 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/33] arm: dts: veyron: Added a flag to disable cache flush +Subject: [PATCH 08/35] arm: dts: veyron: Added a flag to disable cache flush during reset Flushing the MMC cache of ASUS Chromebooks during initialization or @@ -910,7 +910,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 260d6c92cfd1..08ce8bfb70b2 100644 +index 260d6c92cfd11..08ce8bfb70b21 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi @@ -157,6 +157,7 @@ @@ -925,10 +925,10 @@ index 260d6c92cfd1..08ce8bfb70b2 100644 2.44.0 -From a7c8487a2958ba180cf2b9990998267261fee02a Mon Sep 17 00:00:00 2001 +From 9693609003d04ec7dcfa94671d207eb97c9a1b88 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/33] Fix ath9k dwc2 init frame overruns +Subject: [PATCH 09/35] Fix ath9k dwc2 init frame overruns [ by Urja Rannikko: changed to log message to something more sensible. ] @@ -944,10 +944,10 @@ 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 238c6fd50e75..ea4ce893d5b9 100644 +index b0098792dd225..73d7c7754bc57 100644 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c -@@ -1492,6 +1492,16 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh, +@@ -1491,6 +1491,16 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh, device_ns += dwc_tt->usb_tt->think_time; qh->device_us = NS_TO_US(device_ns); @@ -968,10 +968,10 @@ index 238c6fd50e75..ea4ce893d5b9 100644 2.44.0 -From 54ef153a66c47f194086ee4bf64d97d5b75523c1 Mon Sep 17 00:00:00 2001 +From cdf2321f0336afe6e39c5e02b913036f97b8ab8a Mon Sep 17 00:00:00 2001 From: barzur <boris@konbu.org> Date: Fri, 12 Jul 2019 11:33:32 +0900 -Subject: [PATCH 10/33] usb/dwc2/hcd: channel halt may not be an error +Subject: [PATCH 10/35] usb/dwc2/hcd: channel halt may not be an error Truncating the data was causing null pointer exceptions in memcpy, let's be more careful. @@ -1008,7 +1008,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 8c3941ecaaf5..c51ebcdbabbc 100644 +index 60ef8092259a9..a190524108e85 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) @@ -1022,7 +1022,7 @@ index 8c3941ecaaf5..c51ebcdbabbc 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, @@ -1039,10 +1039,10 @@ index 5c7538d498dd..96dc5d8115d2 100644 2.44.0 -From bb9ee5800a14c2ad100b24b898a08bfb0baf6c5f Mon Sep 17 00:00:00 2001 +From 163429d398f24869683f759ad64dfbbd599adace 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/33] drm/panel: edp: Extend Innolux N116BGE mode info for +Subject: [PATCH 11/35] drm/panel: edp: Extend Innolux N116BGE mode info for ~60Hz from 74.25 Mhz Signed-off-by: Urja Rannikko <urjaman@gmail.com> @@ -1051,7 +1051,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 f8511fe5fb0d..19bb450ac04c 100644 +index 52028c8f8988d..cc29548273c2d 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -1295,16 +1295,25 @@ static const struct panel_desc innolux_n116bca_ea1 = { @@ -1086,10 +1086,10 @@ index f8511fe5fb0d..19bb450ac04c 100644 2.44.0 -From 0f567a88870bb26be4b8378fe6dec78743278a86 Mon Sep 17 00:00:00 2001 +From c6c993886b892a26d4734607cc5b39dfdea38264 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/33] ARM: dts: rockchip: Adjust rk3288-veyron n116bge mode +Subject: [PATCH 12/35] ARM: dts: rockchip: Adjust rk3288-veyron n116bge mode for ~60Hz This is an experimental mode that gets very close to 60Hz (60.00067..) @@ -1102,7 +1102,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 fb031964fa2b..128176b7c372 100644 +index fb031964fa2bb..128176b7c3721 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 @@ @@ -1125,10 +1125,10 @@ index fb031964fa2b..128176b7c372 100644 2.44.0 -From 4873ae06b84b76f7dc1bcfb0d18aa6ca3a999d1b Mon Sep 17 00:00:00 2001 +From b7f78923248251a6a239e276c5cf5b3c57be47ab Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Mon, 25 Dec 2023 18:06:10 +0200 -Subject: [PATCH 13/33] dts: veyron: bluetooth: disable dma on uart0 +Subject: [PATCH 13/35] dts: veyron: bluetooth: disable dma on uart0 I just pulled this off the internet ;) https://codeberg.org/petms/linux-veyron-patches-and-apkbuild @@ -1137,7 +1137,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 2992c323d555..949bc1829c8f 100644 +index 2992c323d5554..949bc1829c8fa 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -387,8 +387,6 @@ @@ -1153,10 +1153,10 @@ index 2992c323d555..949bc1829c8f 100644 2.44.0 -From 2c41450c3405c0284b6b25fd98e1441a5efceddc Mon Sep 17 00:00:00 2001 +From d5af5d8d9253b6c2ebb57aea277c953ee9cdfe3e Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:00 +0000 -Subject: [PATCH 14/33] media: v4l2-common: Add helpers to calculate +Subject: [PATCH 14/35] media: v4l2-common: Add helpers to calculate bytesperline and sizeimage Add helper functions to calculate plane bytesperline and sizeimage, @@ -1169,7 +1169,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 0a2f4f0d0a07..8ad04d48a023 100644 +index e4b2de3833ee3..d9b0766f3073f 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -357,6 +357,34 @@ static inline unsigned int v4l2_format_block_height(const struct v4l2_format_inf @@ -1283,10 +1283,10 @@ index 0a2f4f0d0a07..8ad04d48a023 100644 2.44.0 -From d41ce6e070dc7d28a23045232b22c73bf01e943b Mon Sep 17 00:00:00 2001 +From 375376ecff20c3b74a69b171f9dcf59ebd3de77f Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:01 +0000 -Subject: [PATCH 15/33] media: v4l2: Add NV15 and NV20 pixel formats +Subject: [PATCH 15/35] media: v4l2: Add NV15 and NV20 pixel formats Add NV15 and NV20 pixel formats used by the Rockchip Video Decoder for 10-bit buffers. @@ -1311,7 +1311,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 b788f6933855..22cad8c9726b 100644 +index b788f69338554..22cad8c9726bf 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. @@ -1471,7 +1471,7 @@ index b788f6933855..22cad8c9726b 100644 .. _V4L2-PIX-FMT-NV42: diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c -index 8ad04d48a023..53b6fdfcb4dd 100644 +index d9b0766f3073f..f685714b05776 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -277,8 +277,10 @@ const struct v4l2_format_info *v4l2_format_info(u32 format) @@ -1486,10 +1486,10 @@ index 8ad04d48a023..53b6fdfcb4dd 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 0304daa8471d..864cd2939222 100644 +index a16fb44c7246e..e97881f74c0d7 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c -@@ -1361,8 +1361,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) +@@ -1363,8 +1363,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_PIX_FMT_YUV48_12: descr = "12-bit YUV 4:4:4 Packed"; break; case V4L2_PIX_FMT_NV12: descr = "Y/UV 4:2:0"; break; case V4L2_PIX_FMT_NV21: descr = "Y/VU 4:2:0"; break; @@ -1501,7 +1501,7 @@ index 0304daa8471d..864cd2939222 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 e7c4dce39007..700e7033b88e 100644 +index c8cb2796130f8..18503ac931875 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -643,8 +643,10 @@ struct v4l2_pix_format { @@ -1519,10 +1519,10 @@ index e7c4dce39007..700e7033b88e 100644 2.44.0 -From 63d70fa420c23c14efc0b969a5ae088565cb6612 Mon Sep 17 00:00:00 2001 +From 237686914a652fb0447b4d6ac36d3525dc4f63d0 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:02 +0000 -Subject: [PATCH 16/33] media: rkvdec: h264: Use bytesperline and buffer height +Subject: [PATCH 16/35] media: rkvdec: h264: Use bytesperline and buffer height as virstride Use bytesperline and buffer height to calculate the strides configured. @@ -1537,7 +1537,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, @@ -1578,10 +1578,10 @@ index 4fc167b42cf0..7a1e76d423df 100644 2.44.0 -From 4c18051158e7235a151fc4bee1c321c64648a8f9 Mon Sep 17 00:00:00 2001 +From fb960f55f79b32edd3dca98edaff36f9bb920d7a Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 16:55:03 +0000 -Subject: [PATCH 17/33] media: rkvdec: h264: Don't hardcode SPS/PPS parameters +Subject: [PATCH 17/35] media: rkvdec: h264: Don't hardcode SPS/PPS parameters Some SPS/PPS parameters are currently hardcoded in the driver even though they exist in the stable uapi controls. @@ -1596,7 +1596,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, @@ -1633,10 +1633,10 @@ index 7a1e76d423df..8bce8902b8dd 100644 2.44.0 -From 4497c3229a5ebcb7ab88e9fece673c35e775140e Mon Sep 17 00:00:00 2001 +From ad4b6f4b041cfccda2d10c1de4eb9887f850718f Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:04 +0000 -Subject: [PATCH 18/33] media: rkvdec: h264: Remove SPS validation at streaming +Subject: [PATCH 18/35] media: rkvdec: h264: Remove SPS validation at streaming start SPS parameters is validated in try_ctrl() ops so there is no need to @@ -1651,7 +1651,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) @@ -1698,10 +1698,10 @@ index 8bce8902b8dd..815d5359ddd5 100644 2.44.0 -From 18176b03ecf6713410a3d8365ca5068dc0245bc3 Mon Sep 17 00:00:00 2001 +From b7219eee6714bc440df76d0faf0d3dba3f7ef6d1 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:05 +0000 -Subject: [PATCH 19/33] media: rkvdec: Extract rkvdec_fill_decoded_pixfmt into +Subject: [PATCH 19/35] media: rkvdec: Extract rkvdec_fill_decoded_pixfmt into helper Extract call to v4l2_fill_pixfmt_mp() and ajusting of sizeimage into a @@ -1713,7 +1713,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 f9bef5173bf2..e354360f4acc 100644 +index f9bef5173bf25..e354360f4acc1 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,16 @@ @@ -1768,10 +1768,10 @@ index f9bef5173bf2..e354360f4acc 100644 2.44.0 -From fae32be46e985b4aa2a68df21029ab95425db4e2 Mon Sep 17 00:00:00 2001 +From 951b099abd36e11f187832ecf8fca6e9cedffc19 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:06 +0000 -Subject: [PATCH 20/33] media: rkvdec: Move rkvdec_reset_decoded_fmt helper +Subject: [PATCH 20/35] media: rkvdec: Move rkvdec_reset_decoded_fmt helper Move rkvdec_reset_decoded_fmt() and the called rkvdec_reset_fmt() helper functions in preparation for adding a new caller in an upcoming patch. @@ -1782,7 +1782,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 e354360f4acc..1f8f98cf91dc 100644 +index e354360f4acc1..1f8f98cf91dc2 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, @@ -1856,10 +1856,10 @@ index e354360f4acc..1f8f98cf91dc 100644 2.44.0 -From f58e4245ff1ed1229d9254ddfe26cecf8e837d80 Mon Sep 17 00:00:00 2001 +From 57e4b3f8b40cb37a45145a842ba146e1b96cae1e Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:07 +0000 -Subject: [PATCH 21/33] media: rkvdec: Extract decoded format enumeration into +Subject: [PATCH 21/35] media: rkvdec: Extract decoded format enumeration into helper Add a rkvdec_is_valid_fmt() helper that check if a fourcc is a supported @@ -1875,7 +1875,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 1f8f98cf91dc..52e64b399dcc 100644 +index 1f8f98cf91dc2..52e64b399dcc4 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,32 @@ @@ -1970,10 +1970,10 @@ index 1f8f98cf91dc..52e64b399dcc 100644 2.44.0 -From 15c4484fa137701c0a753c1f03e07d6541af7297 Mon Sep 17 00:00:00 2001 +From 4dc183ebd596f798ff8b79292776c89e9f92ca9b Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:08 +0000 -Subject: [PATCH 22/33] media: rkvdec: Add image format concept +Subject: [PATCH 22/35] media: rkvdec: Add image format concept Add an enum rkvdec_image_fmt used to signal an image format, e.g. 4:2:0 8-bit, 4:2:0 10-bit or any. @@ -1988,7 +1988,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 52e64b399dcc..24b04cc35d83 100644 +index 52e64b399dcc4..24b04cc35d834 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,26 +27,42 @@ @@ -2093,7 +2093,7 @@ index 52e64b399dcc..24b04cc35d83 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 { @@ -2133,10 +2133,10 @@ index 633335ebb9c4..6f8cf50c5d99 100644 2.44.0 -From 5314109e97c662380a95480cda3fff4ada060218 Mon Sep 17 00:00:00 2001 +From 1a1d7327c9c7b2e7bc597c9bfc0c49c60d335765 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:09 +0000 -Subject: [PATCH 23/33] media: rkvdec: Add get_image_fmt ops +Subject: [PATCH 23/35] media: rkvdec: Add get_image_fmt ops Add support for a get_image_fmt() ops that return the required image format. @@ -2151,7 +2151,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 24b04cc35d83..d9f72c0b44cf 100644 +index 24b04cc35d834..d9f72c0b44cf9 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) @@ -2218,7 +2218,7 @@ index 24b04cc35d83..d9f72c0b44cf 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 { @@ -2234,10 +2234,10 @@ index 6f8cf50c5d99..e466a2753ccf 100644 2.44.0 -From bad5919154c980c7c2f561faae459c850a6d9883 Mon Sep 17 00:00:00 2001 +From 8b9770c65748649b642f5ace1425b32da544857b Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:10 +0000 -Subject: [PATCH 24/33] media: rkvdec: h264: Support High 10 and 4:2:2 profiles +Subject: [PATCH 24/35] media: rkvdec: h264: Support High 10 and 4:2:2 profiles Add support and enable decoding of H264 High 10 and 4:2:2 profiles. @@ -2264,7 +2264,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, @@ -2326,7 +2326,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 d9f72c0b44cf..20c4eb62bec7 100644 +index d9f72c0b44cf9..20c4eb62bec72 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, @@ -2409,7 +2409,7 @@ index d9f72c0b44cf..20c4eb62bec7 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 { @@ -2426,10 +2426,10 @@ index e466a2753ccf..9a9f4fced7a1 100644 2.44.0 -From e0eb2a7f4293098342e60278a2ca4d637f98a711 Mon Sep 17 00:00:00 2001 +From 8e9ee5bb673707a9d4f311927d8744c3afb39491 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 23:36:08 +0000 -Subject: [PATCH 25/33] media: rkvdec: Add HEVC backend +Subject: [PATCH 25/35] media: rkvdec: Add HEVC backend The Rockchip VDEC supports the HEVC codec with the Main and Main10 Profile up to Level 5.1 High tier: 4096x2304@60 fps. @@ -2453,7 +2453,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 @@ @@ -2462,7 +2462,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 @@ @@ -2478,7 +2478,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 @@ @@ -4332,7 +4332,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 @@ @@ -5151,7 +5151,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 @@ @@ -5163,7 +5163,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 20c4eb62bec7..119a4d14dd1d 100644 +index 20c4eb62bec72..119a4d14dd1d9 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 = { @@ -5257,7 +5257,7 @@ index 20c4eb62bec7..119a4d14dd1d 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); @@ -5272,10 +5272,10 @@ index 9a9f4fced7a1..2f3bda1df5f0 100644 2.44.0 -From 0ec12cc24f690dc4369e3bd97556e7a36ea6ee1f Mon Sep 17 00:00:00 2001 +From 6e15446def1e636ed16b116e07b55074e5285bed Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:09 +0000 -Subject: [PATCH 26/33] media: rkvdec: Add variants support +Subject: [PATCH 26/35] media: rkvdec: Add variants support Different versions of the Rockchip VDEC IP exists and one way they can differ is what decoding formats are supported. @@ -5291,7 +5291,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 119a4d14dd1d..6dda80c6bb51 100644 +index 119a4d14dd1d9..6dda80c6bb515 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -13,6 +13,7 @@ @@ -5369,7 +5369,7 @@ index 119a4d14dd1d..6dda80c6bb51 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 @@ @@ -5414,10 +5414,10 @@ index 2f3bda1df5f0..14ce26a6c618 100644 2.44.0 -From 85ce7ba5132f876352fd090fee0d009db779b74c Mon Sep 17 00:00:00 2001 +From e339e6a12700e4b643e033e3869c971dad11b6b2 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 23:36:10 +0000 -Subject: [PATCH 27/33] media: rkvdec: Implement capability filtering +Subject: [PATCH 27/35] media: rkvdec: Implement capability filtering Add filtering of coded formats and controls depending on a variant capabilities. @@ -5429,7 +5429,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 6dda80c6bb51..3b7484589c7a 100644 +index 6dda80c6bb515..3b7484589c7ae 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[] = { @@ -5567,10 +5567,10 @@ index 6dda80c6bb51..3b7484589c7a 100644 2.44.0 -From 980a3626e2c9879a98b1b74769e06e964e28ce02 Mon Sep 17 00:00:00 2001 +From 4933a96a6045a3cdc45d70f332f8269b8736fbf7 Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:11 +0000 -Subject: [PATCH 28/33] media: rkvdec: Add RK3288 variant +Subject: [PATCH 28/35] media: rkvdec: Add RK3288 variant Add a RK3288 variant, a version of the Rockchip VDEC IP that only support HEVC decoding. @@ -5582,7 +5582,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 3b7484589c7a..7a667e6ecf33 100644 +index 3b7484589c7ae..7a667e6ecf33c 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -1201,6 +1201,10 @@ static void rkvdec_watchdog_func(struct work_struct *work) @@ -5611,10 +5611,10 @@ index 3b7484589c7a..7a667e6ecf33 100644 2.44.0 -From 0169b8699048c7700f1c59a75db8de08aa2f2ab4 Mon Sep 17 00:00:00 2001 +From 6dbf93279924666819d688d1febc936385df355a Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:12 +0000 -Subject: [PATCH 29/33] media: rkvdec: Disable QoS for HEVC and VP9 on RK3328 +Subject: [PATCH 29/35] media: rkvdec: Disable QoS for HEVC and VP9 on RK3328 The RK3328 VDEC has a HW quirk that require QoS to be disabled when HEVC or VP9 is decoded, otherwise the decoded picture may become corrupted. @@ -5633,7 +5633,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) @@ -5653,7 +5653,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 @@ @@ -5666,7 +5666,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) @@ -5687,7 +5687,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 7a667e6ecf33..c12555d4821a 100644 +index 7a667e6ecf33c..c12555d4821af 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -1205,6 +1205,13 @@ static const struct rkvdec_variant rk3288_rkvdec_variant = { @@ -5724,7 +5724,7 @@ index 7a667e6ecf33..c12555d4821a 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 @@ @@ -5756,10 +5756,10 @@ index 14ce26a6c618..1d5d405da56c 100644 2.44.0 -From 3c4575e4f2232ad4dc10c957e9c1cf0d6d6d12a5 Mon Sep 17 00:00:00 2001 +From 928789a04620d5b996c8c1cfac70f3050cc5d72d Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 23:36:13 +0000 -Subject: [PATCH 30/33] media: dt-bindings: rockchip,vdec: Add RK3288 +Subject: [PATCH 30/35] media: dt-bindings: rockchip,vdec: Add RK3288 compatible Add a RK3288 compatible for a version of the Rockchip VDEC IP that only @@ -5771,7 +5771,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: |- @@ -5789,10 +5789,10 @@ index 08b02ec16755..0f00e9c86737 100644 2.44.0 -From 40a689a77ab3c2ac39366fcf988d0f925054ffdc Mon Sep 17 00:00:00 2001 +From 7b0af0461ab30501ea8b1c43244729efbc2dde6a Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:14 +0000 -Subject: [PATCH 31/33] ARM: dts: rockchip: Add vdec node for RK3288 +Subject: [PATCH 31/35] ARM: dts: rockchip: Add vdec node for RK3288 RK3288 contains a Rockchip VDEC block that only support HEVC decoding. Add a vdec node for this. @@ -5804,7 +5804,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 949bc1829c8f..dbf2d3b8f13e 100644 +index 949bc1829c8fa..dbf2d3b8f13e1 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -1296,6 +1296,21 @@ @@ -5842,10 +5842,10 @@ index 949bc1829c8f..dbf2d3b8f13e 100644 2.44.0 -From a1129ed45fabc36304bb0ce2a92e0e3d544682bf Mon Sep 17 00:00:00 2001 +From e7d1fa7bd2f761e39c66b91f206d70c13557157d Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Tue, 28 Sep 2021 20:23:13 +0300 -Subject: [PATCH 32/33] Revert "clk: divider: Implement and wire up +Subject: [PATCH 32/35] Revert "clk: divider: Implement and wire up .determine_rate by default" This reverts commit 69a00fb3d6970681c15a23595ec54233ce10295c. @@ -5857,7 +5857,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 c1f426b8a504..3941b4d984f7 100644 +index c1f426b8a5043..3941b4d984f7d 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -452,27 +452,6 @@ static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate, @@ -5908,10 +5908,10 @@ index c1f426b8a504..3941b4d984f7 100644 2.44.0 -From 45c6ce9d1ab3c9bfa9ad1ccb76ebcfe0f0d42a6d Mon Sep 17 00:00:00 2001 +From 0f1b665a178eacc1da6a305079793801e9cc8396 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel <sebastian.reichel@collabora.com> Date: Tue, 30 Jul 2024 20:05:05 +0200 -Subject: [PATCH 33/33] mfd: rk8xx: Fix shutdown handler +Subject: [PATCH 33/35] mfd: rk8xx: Fix shutdown handler When I converted rk808 to device managed resources I converted the rk808 specific pm_power_off handler to devm_register_sys_off_handler() using @@ -6010,7 +6010,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c -index 71c2b80a4678..1583beef714a 100644 +index 71c2b80a4678d..1583beef714ad 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c @@ -692,10 +692,11 @@ void rk8xx_shutdown(struct device *dev) @@ -6050,7 +6050,7 @@ index 71c2b80a4678..1583beef714a 100644 if (ret) return dev_err_probe(dev, ret, diff --git a/drivers/mfd/rk8xx-i2c.c b/drivers/mfd/rk8xx-i2c.c -index 37287b06dab0..b8c0c368ab8a 100644 +index 37287b06dab0d..b8c0c368ab8a2 100644 --- a/drivers/mfd/rk8xx-i2c.c +++ b/drivers/mfd/rk8xx-i2c.c @@ -213,7 +213,7 @@ static int rk8xx_i2c_probe(struct i2c_client *client) @@ -6063,7 +6063,7 @@ index 37287b06dab0..b8c0c368ab8a 100644 static void rk8xx_i2c_shutdown(struct i2c_client *client) diff --git a/drivers/mfd/rk8xx-spi.c b/drivers/mfd/rk8xx-spi.c -index 3405fb82ff9f..20f9428f94bb 100644 +index 3405fb82ff9fb..20f9428f94bb9 100644 --- a/drivers/mfd/rk8xx-spi.c +++ b/drivers/mfd/rk8xx-spi.c @@ -94,7 +94,7 @@ static int rk8xx_spi_probe(struct spi_device *spi) @@ -6076,7 +6076,7 @@ index 3405fb82ff9f..20f9428f94bb 100644 static const struct of_device_id rk8xx_spi_of_match[] = { diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h -index 69cbea78b430..be15b84cff9e 100644 +index 69cbea78b430b..be15b84cff9e9 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -1349,7 +1349,7 @@ struct rk808 { @@ -6091,3 +6091,72 @@ index 69cbea78b430..be15b84cff9e 100644 -- 2.44.0 + +From 0714fa079a5f429e063d758d52dc1c380f21df05 Mon Sep 17 00:00:00 2001 +From: Robin Murphy <robin.murphy@arm.com> +Date: Tue, 20 May 2025 18:10:16 +0100 +Subject: [PATCH 34/35] firmware: smccc: Stub out get_conduit() + +Various callers use arm_smccc_1_1_get_conduit() to guard their +arm_smccc_smc() calls - since the latter is already stubbed out to +support optional usage in !HAVE_ARM_SMCCC configs, do the equivalent +for the former as well to make life easier. + +Signed-off-by: Robin Murphy <robin.murphy@arm.com> +--- + include/linux/arm-smccc.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h +index a3863da1510ee..97dc4d47c6642 100644 +--- a/include/linux/arm-smccc.h ++++ b/include/linux/arm-smccc.h +@@ -315,7 +315,14 @@ enum arm_smccc_conduit { + * + * When SMCCCv1.1 is not present, returns SMCCC_CONDUIT_NONE. + */ ++#ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY + enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void); ++#else ++static inline enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void) ++{ ++ return SMCCC_CONDUIT_NONE; ++} ++#endif + + /** + * arm_smccc_get_version() +-- +2.44.0 + + +From 4518d53c412a71a10896ecdc19c5dee63e8564fd Mon Sep 17 00:00:00 2001 +From: Robin Murphy <robin.murphy@arm.com> +Date: Tue, 20 May 2025 18:10:17 +0100 +Subject: [PATCH 35/35] pmdomain: rockchip: Relax SMCCC dependency + +Most 32-bit Rockchip platforms do not use PSCI, so having to select +ARM_PSCI to satisfy a dependency chain to retain working power domain +support is a bit weird and non-obvious. Now that the offending SMCCC API +is properly stubbed out for optional usage, we can relax this again. + +Signed-off-by: Robin Murphy <robin.murphy@arm.com> +--- + drivers/pmdomain/rockchip/Kconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/pmdomain/rockchip/Kconfig b/drivers/pmdomain/rockchip/Kconfig +index 218d43186e5b9..ffe5e7b78494f 100644 +--- a/drivers/pmdomain/rockchip/Kconfig ++++ b/drivers/pmdomain/rockchip/Kconfig +@@ -4,7 +4,6 @@ if ARCH_ROCKCHIP || COMPILE_TEST + config ROCKCHIP_PM_DOMAINS + bool "Rockchip generic power domain" + depends on PM +- depends on HAVE_ARM_SMCCC_DISCOVERY + depends on REGULATOR + select PM_GENERIC_DOMAINS + help +-- +2.44.0 +