| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-07-16 16:07:16 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-07-16 16:07:16 UTC |
| parent | 44c2d897b30c37f5b93e777264fd847d52b04951 |
| .SRCINFO | +4 | -4 |
| PKGBUILD | +3 | -3 |
| armlfs.patch | +68 | -73 |
diff --git a/.SRCINFO b/.SRCINFO index 5c3ae03..f4c1804 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = linux-armlfs-lts - pkgver = 6.6.93 + pkgver = 6.6.98 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.93.xz + source = https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.6.98.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 = 5cf8db0daba2311c9dc3cfe95d7895e7217896520c49927f6e3dd2b6538b81f1 - sha256sums = a7593467d331fde3fb5b09d45e957ee85a99cf80025c72c73ba02ba1299a38ff + sha256sums = 76bf652d88ecd40ae888ac786a268b0a9006b275424feddcac85a8261605d479 + sha256sums = 3579621a2d22a6022687fd6d7dfaa41e994c18cccde346ce4f824f07be7a95af sha256sums = 91c73d902368f464c64626128932220a5ca7d26f7ac25eec00c1865810c51173 sha256sums = 4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb sha256sums = bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b diff --git a/PKGBUILD b/PKGBUILD index 4b2150e..303364f 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.93 +pkgver=6.6.98 pkgrel=1 arch=('armv7h') url="http://www.kernel.org/" @@ -169,8 +169,8 @@ for _p in ${pkgname[@]}; do done sha256sums=('d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0' - '5cf8db0daba2311c9dc3cfe95d7895e7217896520c49927f6e3dd2b6538b81f1' - 'a7593467d331fde3fb5b09d45e957ee85a99cf80025c72c73ba02ba1299a38ff' + '76bf652d88ecd40ae888ac786a268b0a9006b275424feddcac85a8261605d479' + '3579621a2d22a6022687fd6d7dfaa41e994c18cccde346ce4f824f07be7a95af' '91c73d902368f464c64626128932220a5ca7d26f7ac25eec00c1865810c51173' '4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb' 'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b' diff --git a/armlfs.patch b/armlfs.patch index 5423da2..51deaa4 100644 --- a/armlfs.patch +++ b/armlfs.patch @@ -1,4 +1,4 @@ -From ff1a274d8490e45868755acbf258efd4ea3654fc Mon Sep 17 00:00:00 2001 +From 24fdf729bf0f4cac393e669be009b882299ace22 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 @@ -166,7 +166,7 @@ index 758ebaf2236bf..7ee324e4186fb 100644 2.44.0 -From c9f5021df13fd7892e5fe167970f71d65291473d Mon Sep 17 00:00:00 2001 +From 561b62fd10c6818f4c0c019e51c5844617a46bbe 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 @@ -617,7 +617,7 @@ index aae48e906af11..81f8a82aa5d46 100644 2.44.0 -From 74c5f6130d6254fc736cc6285b14c2147d1d7561 Mon Sep 17 00:00:00 2001 +From 928f22e69f15c5f99cd2bd39e9e21c90adef2408 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 @@ -656,7 +656,7 @@ index 8593a83599376..1cfa4eda5abf9 100644 2.44.0 -From 778bafbd20896bc0b3c61f872c04ddc6690a4913 Mon Sep 17 00:00:00 2001 +From 608f3e403bf7d5a3062ea6af3274b2c31cfe9196 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 @@ -749,7 +749,7 @@ index 092316be67f74..e4d5c02406579 100644 2.44.0 -From 2611eabe108277abd922d695d491434adfa95f71 Mon Sep 17 00:00:00 2001 +From 473dd0783e39cef0cd29101a3354e79577f6aef0 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 @@ -802,7 +802,7 @@ index 3564a0f63c9c7..fbfc5c628f144 100644 2.44.0 -From 36c01b237784dcb8a3f7345fac3c6b93fceb7690 Mon Sep 17 00:00:00 2001 +From 15f06646c8be17acf7f877468f74b50727e6fbd2 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 @@ -955,7 +955,7 @@ index 84b9f36b9e479..09726227e8913 100644 2.44.0 -From cd9c4688e40c2be4e683f741c703ebccfb216532 Mon Sep 17 00:00:00 2001 +From d97e8a59676a15c792df47f585ff3a48b03547a7 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 @@ -1043,7 +1043,7 @@ index 62a6847a3b6f0..d80cc06fa2c6e 100644 2.44.0 -From 7fd603e51a94df2d1c1781a757173448fd51e1ed Mon Sep 17 00:00:00 2001 +From 50eba283fcc6ccdb677133a9ec35d600241389b1 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 @@ -1076,7 +1076,7 @@ index d838bf0d5d9a0..7aeb70e9b828b 100644 2.44.0 -From f4c68f344f8d4e046c442f7f4b612fc637ca3755 Mon Sep 17 00:00:00 2001 +From dde2d38efe5826b2c0bd34bad4776cdacf01a756 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 @@ -1119,7 +1119,7 @@ index 0d4495c6b9f7b..3444cfd358404 100644 2.44.0 -From 80454fa8c8c63830d101834a0a89b495a4018ff2 Mon Sep 17 00:00:00 2001 +From 667cddd78fab89c8bd108800326572b386a67a47 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 @@ -1190,7 +1190,7 @@ index 5c7538d498dd1..96dc5d8115d2c 100644 2.44.0 -From 433fb5e0f56ed4a1a5bad0cce579d84c0de9c937 Mon Sep 17 00:00:00 2001 +From 8ccd96107a221193d49bee0c9560eb7a5f03f353 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 @@ -1237,7 +1237,7 @@ index 53b3b24d7d7c0..dd6fdd3d45891 100644 2.44.0 -From 7365a29908b3ba92d37cdc038cb46b2d6af5add4 Mon Sep 17 00:00:00 2001 +From dcf78c9bda066b3a0545da3e28e4493ee782a48c 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 @@ -1276,7 +1276,7 @@ index 32c0f10765dd3..ea20818202fce 100644 2.44.0 -From 4819890104eb7f6f43f44f66a76ddb4d94c96f7b Mon Sep 17 00:00:00 2001 +From 5e7853cbd02cdeb4bedf1dea0b7ba12504351047 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 @@ -1342,7 +1342,7 @@ index a2c2b5203b0a9..9a63a0447d6fe 100644 2.44.0 -From 10253249db862cd651cdc321ed34283c0c925828 Mon Sep 17 00:00:00 2001 +From 8d21cea8d98e2f0af96248ac16edd26017f54869 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 @@ -1370,7 +1370,7 @@ index 1cfa4eda5abf9..bba671f0de4fb 100644 2.44.0 -From da97cc07a6afb85e5ac5249ac9d98c20238c58ee Mon Sep 17 00:00:00 2001 +From 0ecbdd79742077c5f49512aa479b19eba2bf69c7 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 @@ -1436,7 +1436,7 @@ index 5eed091d4c291..6d6a8686c8daf 100644 2.44.0 -From 28ffade18a2a02541e097acbb47d2a9c4586830d Mon Sep 17 00:00:00 2001 +From 1ca6f00a82b46857945268f216bfcbdce74f6f59 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 @@ -1678,7 +1678,7 @@ index f7d0edd762b36..9f03f98ab66be 100644 2.44.0 -From 141829fe9b9e829a9f73bf899c2adf1412ad2c25 Mon Sep 17 00:00:00 2001 +From 44f5c2799046ba91f83d797222049cf93ede4c78 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 @@ -1808,7 +1808,7 @@ index 3a4b15a98e021..834b426da8b13 100644 2.44.0 -From fc51f6ced38f4895d9790470f53437f5e3ae2b65 Mon Sep 17 00:00:00 2001 +From ca1f8dad64d732c1b239963332c3b3f5eb1e3099 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 @@ -2044,7 +2044,7 @@ index 78260e5d9985f..79b5ef45605cd 100644 2.44.0 -From f08cfe5d65689861450658310da3595f1ac798c2 Mon Sep 17 00:00:00 2001 +From edff51b76d4bf5efa4fa4c91675d963ad2fdf41b 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 @@ -2103,7 +2103,7 @@ index 4fc167b42cf0c..7a1e76d423df5 100644 2.44.0 -From 82bf0d13add6085fb8df6fdf5b0c00fae5a8bc58 Mon Sep 17 00:00:00 2001 +From 71a775220a425b44c5808100021576ccc83859d1 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 @@ -2158,7 +2158,7 @@ index 7a1e76d423df5..8bce8902b8dda 100644 2.44.0 -From 66d06b82f14350155c35b802ecd0a0a32895b350 Mon Sep 17 00:00:00 2001 +From 7535a4bdf96ce1beb138f16f3d007209f455556e 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 @@ -2223,7 +2223,7 @@ index 8bce8902b8dda..815d5359ddd5c 100644 2.44.0 -From 7c1b11ee7d598f56de539ada199b2924dc37077e Mon Sep 17 00:00:00 2001 +From 2f09d37e51fc95c03a76705144ef83dbd4f76d71 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 ac398b5a97360..d1087519d2180 100644 +index a1d941b0be00b..364ef518c93ef 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,16 @@ @@ -2275,7 +2275,7 @@ index ac398b5a97360..d1087519d2180 100644 } static int rkvdec_enum_framesizes(struct file *file, void *priv, -@@ -264,12 +270,7 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, +@@ -270,12 +276,7 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, &pix_mp->height, &coded_desc->frmsize); @@ -2293,7 +2293,7 @@ index ac398b5a97360..d1087519d2180 100644 2.44.0 -From 41fa45805903fd9c7af288da12210a9e120f8d76 Mon Sep 17 00:00:00 2001 +From 860065e4f0a0839e912d576e05c3aba5c8f17520 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 d1087519d2180..7e59db3fc24d1 100644 +index 364ef518c93ef..056f5d8e23900 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 d1087519d2180..7e59db3fc24d1 100644 2.44.0 -From c51a83671746174c311cc58e8ea7d4b08be0d75f Mon Sep 17 00:00:00 2001 +From 774e0cd93ccc8f0f9bbc232a30b720e6c798d801 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 7e59db3fc24d1..efbf9aa578aee 100644 +index 056f5d8e23900..56bae701d95f6 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,32 @@ @@ -2448,7 +2448,7 @@ index 7e59db3fc24d1..efbf9aa578aee 100644 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; f->fmt.pix_mp.width = ctx->coded_fmt.fmt.pix_mp.width; f->fmt.pix_mp.height = ctx->coded_fmt.fmt.pix_mp.height; -@@ -244,7 +272,6 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, +@@ -250,7 +278,6 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv); const struct rkvdec_coded_fmt_desc *coded_desc; @@ -2456,7 +2456,7 @@ index 7e59db3fc24d1..efbf9aa578aee 100644 /* * The codec context should point to a coded format desc, if the format -@@ -255,13 +282,8 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, +@@ -261,13 +288,8 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, if (WARN_ON(!coded_desc)) return -EINVAL; @@ -2472,7 +2472,7 @@ index 7e59db3fc24d1..efbf9aa578aee 100644 /* Always apply the frmsize constraint of the coded end. */ pix_mp->width = max(pix_mp->width, ctx->coded_fmt.fmt.pix_mp.width); -@@ -425,14 +447,13 @@ static int rkvdec_enum_capture_fmt(struct file *file, void *priv, +@@ -431,14 +453,13 @@ static int rkvdec_enum_capture_fmt(struct file *file, void *priv, struct v4l2_fmtdesc *f) { struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv); @@ -2495,7 +2495,7 @@ index 7e59db3fc24d1..efbf9aa578aee 100644 2.44.0 -From c10dbb362971d73c080b6062eb4eb9b92e304145 Mon Sep 17 00:00:00 2001 +From 9ac0bff5b2e9849d9cd20d4afc126d485aa98157 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 efbf9aa578aee..d8fb2d935ffcf 100644 +index 56bae701d95f6..f55ca5409ec1b 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,26 +27,42 @@ @@ -2588,7 +2588,7 @@ index efbf9aa578aee..d8fb2d935ffcf 100644 }; static const struct rkvdec_ctrl_desc rkvdec_vp9_ctrl_descs[] = { -@@ -282,8 +301,9 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, +@@ -288,8 +307,9 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, if (WARN_ON(!coded_desc)) return -EINVAL; @@ -2600,7 +2600,7 @@ index efbf9aa578aee..d8fb2d935ffcf 100644 /* Always apply the frmsize constraint of the coded end. */ pix_mp->width = max(pix_mp->width, ctx->coded_fmt.fmt.pix_mp.width); -@@ -400,6 +420,7 @@ static int rkvdec_s_output_fmt(struct file *file, void *priv, +@@ -406,6 +426,7 @@ static int rkvdec_s_output_fmt(struct file *file, void *priv, * * Note that this will propagates any size changes to the decoded format. */ @@ -2608,7 +2608,7 @@ index efbf9aa578aee..d8fb2d935ffcf 100644 rkvdec_reset_decoded_fmt(ctx); /* Propagate colorspace information to capture. */ -@@ -449,7 +470,7 @@ static int rkvdec_enum_capture_fmt(struct file *file, void *priv, +@@ -455,7 +476,7 @@ static int rkvdec_enum_capture_fmt(struct file *file, void *priv, struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv); u32 fourcc; @@ -2658,7 +2658,7 @@ index 633335ebb9c49..6f8cf50c5d99a 100644 2.44.0 -From 74fc45fd129c5f915ac41f4c151ae27308b3789a Mon Sep 17 00:00:00 2001 +From 1f6c87c0b2b99b6df571e62b99d8d821cb0bd176 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 d8fb2d935ffcf..455b9cd34b6ae 100644 +index f55ca5409ec1b..92f4677aae7f4 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) @@ -2759,7 +2759,7 @@ index 6f8cf50c5d99a..e466a2753ccfc 100644 2.44.0 -From 031242603bf79a9dd8ca7428f5b64ea15e78bc38 Mon Sep 17 00:00:00 2001 +From acd26a7af5c77ddf53a0b7e54c56e8e100fc3694 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 @@ -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 455b9cd34b6ae..7d909d4a5d000 100644 +index 92f4677aae7f4..595af0cb434bf 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, @@ -2951,7 +2951,7 @@ index e466a2753ccfc..9a9f4fced7a18 100644 2.44.0 -From cacceb916a224201c8b01b3051919cf044ef6eed Mon Sep 17 00:00:00 2001 +From 597eac172a2a2dc86c1c1acdadc03c59dd0c302e 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 @@ -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 7d909d4a5d000..ca82ccda1825e 100644 +index 595af0cb434bf..018f066a2b395 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 = { @@ -5797,7 +5797,7 @@ index 9a9f4fced7a18..2f3bda1df5f07 100644 2.44.0 -From 858d66ce09d5169a5a9c7a2f376334b55147c9dc Mon Sep 17 00:00:00 2001 +From 8defeb0dc467c711dcad2d120fbde879d6163fb8 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 ca82ccda1825e..768683747e8a3 100644 +index 018f066a2b395..cbef237af5e0e 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -13,6 +13,7 @@ @@ -5851,7 +5851,7 @@ index ca82ccda1825e..768683747e8a3 100644 } }; -@@ -1170,8 +1174,17 @@ static void rkvdec_watchdog_func(struct work_struct *work) +@@ -1176,8 +1180,17 @@ static void rkvdec_watchdog_func(struct work_struct *work) } } @@ -5870,7 +5870,7 @@ index ca82ccda1825e..768683747e8a3 100644 { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_rkvdec_match); -@@ -1182,16 +1195,22 @@ static const char * const rkvdec_clk_names[] = { +@@ -1188,16 +1201,22 @@ static const char * const rkvdec_clk_names[] = { static int rkvdec_probe(struct platform_device *pdev) { @@ -5939,7 +5939,7 @@ index 2f3bda1df5f07..14ce26a6c6186 100644 2.44.0 -From 9f2890bfabe52c12e31a2549d819c08790cbb038 Mon Sep 17 00:00:00 2001 +From 6dab9f4eb03d0fcb43ab037690833f10d49570ac 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 @@ -5950,11 +5950,11 @@ capabilities. Signed-off-by: Alex Bee <knaerzche@gmail.com> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- - drivers/staging/media/rkvdec/rkvdec.c | 63 +++++++++++++++++++-------- - 1 file changed, 46 insertions(+), 17 deletions(-) + drivers/staging/media/rkvdec/rkvdec.c | 61 ++++++++++++++++++++------- + 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 768683747e8a3..6725c5f06d10b 100644 +index cbef237af5e0e..c7fefc26ea83d 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[] = { @@ -6003,7 +6003,7 @@ index 768683747e8a3..6725c5f06d10b 100644 rkvdec_reset_fmt(ctx, f, ctx->coded_fmt_desc->fourcc); f->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; -@@ -401,17 +422,18 @@ static void rkvdec_reset_coded_fmt(struct rkvdec_ctx *ctx) +@@ -401,13 +422,14 @@ static void rkvdec_reset_coded_fmt(struct rkvdec_ctx *ctx) static int rkvdec_enum_framesizes(struct file *file, void *priv, struct v4l2_frmsizeenum *fsize) { @@ -6020,13 +6020,8 @@ index 768683747e8a3..6725c5f06d10b 100644 + if (!desc) return -EINVAL; - fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE; -- fsize->stepwise = fmt->frmsize; -+ fsize->stepwise = desc->frmsize; - return 0; - } - -@@ -469,10 +491,10 @@ static int rkvdec_try_output_fmt(struct file *file, void *priv, + fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; +@@ -475,10 +497,10 @@ static int rkvdec_try_output_fmt(struct file *file, void *priv, struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv); const struct rkvdec_coded_fmt_desc *desc; @@ -6040,7 +6035,7 @@ index 768683747e8a3..6725c5f06d10b 100644 } v4l2_apply_frmsize_constraints(&pix_mp->width, -@@ -549,7 +571,7 @@ static int rkvdec_s_output_fmt(struct file *file, void *priv, +@@ -555,7 +577,7 @@ static int rkvdec_s_output_fmt(struct file *file, void *priv, if (ret) return ret; @@ -6049,7 +6044,7 @@ index 768683747e8a3..6725c5f06d10b 100644 if (!desc) return -EINVAL; ctx->coded_fmt_desc = desc; -@@ -601,10 +623,14 @@ static int rkvdec_g_capture_fmt(struct file *file, void *priv, +@@ -607,10 +629,14 @@ static int rkvdec_g_capture_fmt(struct file *file, void *priv, static int rkvdec_enum_output_fmt(struct file *file, void *priv, struct v4l2_fmtdesc *f) { @@ -6066,7 +6061,7 @@ index 768683747e8a3..6725c5f06d10b 100644 return 0; } -@@ -971,14 +997,17 @@ static int rkvdec_init_ctrls(struct rkvdec_ctx *ctx) +@@ -977,14 +1003,17 @@ static int rkvdec_init_ctrls(struct rkvdec_ctx *ctx) int ret; for (i = 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) @@ -6092,7 +6087,7 @@ index 768683747e8a3..6725c5f06d10b 100644 2.44.0 -From 9cc9ac65e0c5c052d77d797da6164efaf6acccbb Mon Sep 17 00:00:00 2001 +From 54e88d858564c17948efc70142526d05b0b77440 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,10 +6102,10 @@ 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 6725c5f06d10b..ba5812707e031 100644 +index c7fefc26ea83d..d179f48ca91a5 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) +@@ -1209,6 +1209,10 @@ static void rkvdec_watchdog_func(struct work_struct *work) } } @@ -6121,7 +6116,7 @@ index 6725c5f06d10b..ba5812707e031 100644 static const struct rkvdec_variant rk3399_rkvdec_variant = { .capabilities = RKVDEC_CAPABILITY_HEVC | RKVDEC_CAPABILITY_H264 | -@@ -1210,6 +1214,10 @@ static const struct rkvdec_variant rk3399_rkvdec_variant = { +@@ -1216,6 +1220,10 @@ static const struct rkvdec_variant rk3399_rkvdec_variant = { }; static const struct of_device_id of_rkvdec_match[] = { @@ -6136,7 +6131,7 @@ index 6725c5f06d10b..ba5812707e031 100644 2.44.0 -From c72f834d4b0b599dafe27c7931ccb990f8d2dbde Mon Sep 17 00:00:00 2001 +From 3f91e0cd61200f189648cf6adcef6c2befa99586 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 @@ -6212,10 +6207,10 @@ 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 ba5812707e031..e76a719e021cd 100644 +index d179f48ca91a5..c2bf37d38a3db 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 = { +@@ -1213,6 +1213,13 @@ static const struct rkvdec_variant rk3288_rkvdec_variant = { .capabilities = RKVDEC_CAPABILITY_HEVC, }; @@ -6229,7 +6224,7 @@ index ba5812707e031..e76a719e021cd 100644 static const struct rkvdec_variant rk3399_rkvdec_variant = { .capabilities = RKVDEC_CAPABILITY_HEVC | RKVDEC_CAPABILITY_H264 | -@@ -1218,6 +1225,10 @@ static const struct of_device_id of_rkvdec_match[] = { +@@ -1224,6 +1231,10 @@ static const struct of_device_id of_rkvdec_match[] = { .compatible = "rockchip,rk3288-vdec", .data = &rk3288_rkvdec_variant, }, @@ -6240,7 +6235,7 @@ index ba5812707e031..e76a719e021cd 100644 { .compatible = "rockchip,rk3399-vdec", .data = &rk3399_rkvdec_variant, -@@ -1248,6 +1259,7 @@ static int rkvdec_probe(struct platform_device *pdev) +@@ -1254,6 +1265,7 @@ static int rkvdec_probe(struct platform_device *pdev) platform_set_drvdata(pdev, rkvdec); rkvdec->dev = &pdev->dev; rkvdec->capabilities = variant->capabilities; @@ -6281,7 +6276,7 @@ index 14ce26a6c6186..1d5d405da56cb 100644 2.44.0 -From b8555ac13576a64ff5fcea6a1f6035318568f5b8 Mon Sep 17 00:00:00 2001 +From 79abdbcc22b7034bc373925183277ce9702df3d7 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 @@ -6314,7 +6309,7 @@ index 08b02ec167557..0f00e9c86737a 100644 2.44.0 -From 78edb77b60ab7253316127658c93ac4e5b5e8a88 Mon Sep 17 00:00:00 2001 +From 804213f3d1a286747c9a3bcb73071edd257bb738 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 @@ -6367,7 +6362,7 @@ index bba671f0de4fb..9065650080c1f 100644 2.44.0 -From 4a560c3a4e048aa57506f94dcbb6fd1fc10fa749 Mon Sep 17 00:00:00 2001 +From b8a6ff6018167c6130ae129143088a1da3103489 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