| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-07-30 08:44:49 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-07-30 08:44:49 UTC |
| parent | d30fc0ec1e13426985f475f4489a7260ee0d259c |
| PKGBUILD | +5 | -5 |
| armlfs.patch | +96 | -96 |
| kernel.its | +91 | -7 |
diff --git a/PKGBUILD b/PKGBUILD index 790caf6..91596b1 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.42 +pkgver=6.6.43 pkgrel=1 arch=('armv7h') url="http://www.kernel.org/" @@ -169,10 +169,10 @@ for _p in ${pkgname[@]}; do done sha256sums=('d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0' - 'ee862116da0f361ce3d569547557e6d308b0f7228733bfc81b52eadcad9acdb5' - 'd3fccfc896f15d01d5276031526b0f9f084497d87fd15041f9c2afcf348cbacc' - '9e6979121d1f3067561d1fe3e1914a36ac0e06197293a94f09d2405d36698f4a' + '0407cc09f1109a1818a21e5656055822579ba4c04d18abe20e9a3cb51e62713b' + '53d3ad4009393e5df348b8ad13680dce821c3e49608c2350d5cfbca1e562ab1d' + '91c73d902368f464c64626128932220a5ca7d26f7ac25eec00c1865810c51173' '4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb' 'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' - 'SKIP') + '0f887b4634acdb87fab95d4fa8d7574633c5f0f0e6f7da4e3f4fe34cddb915c2') diff --git a/armlfs.patch b/armlfs.patch index a41dcc0..0ed7c1f 100644 --- a/armlfs.patch +++ b/armlfs.patch @@ -1,4 +1,4 @@ -From a173b2a6e93c8485ce0632577b68c7f59f460d7e Mon Sep 17 00:00:00 2001 +From bfdeba7d256d1fad86f596784d92499cf5a709f6 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 baa5aebd327..11493f0be2b 100644 +index baa5aebd3277..11493f0be2b1 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -195,10 +195,14 @@ PNAME(mux_ddrphy_p) = { "dpll_ddr", "gpll_ddr" }; @@ -149,7 +149,7 @@ index baa5aebd327..11493f0be2b 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 758ebaf2236..7ee324e4186 100644 +index 758ebaf2236b..7ee324e4186f 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -510,6 +510,9 @@ struct clk *rockchip_clk_register_muxgrf(const char *name, @@ -166,7 +166,7 @@ index 758ebaf2236..7ee324e4186 100644 2.44.0 -From 7919d0bc30048ce2c8fc5e9452f5c0fec30f252e Mon Sep 17 00:00:00 2001 +From 7cffea41661fb1198a921d6aad050afb393f6523 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 34155019911..4dd10e1324a 100644 +index 341550199111..4dd10e1324a4 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 { @@ -617,7 +617,7 @@ index 34155019911..4dd10e1324a 100644 2.44.0 -From 021691eb31fd5b45a7ef55aa078cf012f6439772 Mon Sep 17 00:00:00 2001 +From cc8a191cef736ab3c1ab905927afe4d2648bb4ab 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 8593a835993..1cfa4eda5ab 100644 +index 8593a8359937..1cfa4eda5abf 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -867,12 +867,14 @@ @@ -656,7 +656,7 @@ index 8593a835993..1cfa4eda5ab 100644 2.44.0 -From 9eca78a010f5f942cb764349e925948d32c46ea8 Mon Sep 17 00:00:00 2001 +From e2ed63d2b240b64efcff9ba9cd119ca890647060 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 092316be67f..e4d5c024065 100644 +index 092316be67f7..e4d5c0240657 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi @@ -83,6 +83,68 @@ @@ -749,7 +749,7 @@ index 092316be67f..e4d5c024065 100644 2.44.0 -From 2352566c47853cdd1334ff3eb18d77af24591a0d Mon Sep 17 00:00:00 2001 +From 3c545b37092641715a5271525bad028d0dbd5f6f 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 3564a0f63c9..fbfc5c628f1 100644 +index 3564a0f63c9c..fbfc5c628f14 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1028,6 +1028,7 @@ static unsigned int mmc_blk_data_timeout_ms(struct mmc_host *host, @@ -802,7 +802,7 @@ index 3564a0f63c9..fbfc5c628f1 100644 2.44.0 -From 32c308ea0e1f8d4ad879978e197b60c1944df747 Mon Sep 17 00:00:00 2001 +From 984984523fc802ac95b785991d3430b9fb495062 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 5e9be13a56a..8cdfcc48558 100644 +index 5e9be13a56a8..8cdfcc48558c 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 5e9be13a56a..8cdfcc48558 100644 } diff --git a/block/partitions/efi.h b/block/partitions/efi.h -index 84b9f36b9e4..09726227e89 100644 +index 84b9f36b9e47..09726227e891 100644 --- a/block/partitions/efi.h +++ b/block/partitions/efi.h @@ -26,7 +26,8 @@ @@ -955,7 +955,7 @@ index 84b9f36b9e4..09726227e89 100644 2.44.0 -From 2d15d3b40f6d0d783194602716d2c123437e1c13 Mon Sep 17 00:00:00 2001 +From 687418c4e4f8f814d91ea8b58a7a5ef2f1e45865 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 cf396e8f34e..135cba5d5aa 100644 +index cf396e8f34e9..135cba5d5aa3 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -409,6 +409,8 @@ int mmc_of_parse(struct mmc_host *host) @@ -991,7 +991,7 @@ index cf396e8f34e..135cba5d5aa 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 7e39017e440..a8406756299 100644 +index 7e39017e440f..a8406756299d 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -2238,6 +2238,12 @@ static int mmc_runtime_resume(struct mmc_host *host) @@ -1028,7 +1028,7 @@ index 7e39017e440..a8406756299 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 62a6847a3b6..d80cc06fa2c 100644 +index 62a6847a3b6f..d80cc06fa2c6 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -427,6 +427,7 @@ struct mmc_host { @@ -1043,7 +1043,7 @@ index 62a6847a3b6..d80cc06fa2c 100644 2.44.0 -From d8a01737b60e6a3b2b899f2ec3316f9551a628ea Mon Sep 17 00:00:00 2001 +From 11529142cbc74b75ad0b87c70b81c438c241ba80 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 d838bf0d5d9..7aeb70e9b82 100644 +index d838bf0d5d9a..7aeb70e9b828 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi @@ -157,6 +157,7 @@ @@ -1076,7 +1076,7 @@ index d838bf0d5d9..7aeb70e9b82 100644 2.44.0 -From 517d090a37d20fe1ab7799d41751ddaa90388b45 Mon Sep 17 00:00:00 2001 +From 113223d4862e661cd2b7745cecaeab65301638da 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 0d4495c6b9f..3444cfd3584 100644 +index 0d4495c6b9f7..3444cfd35840 100644 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c @@ -1528,6 +1528,16 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh, @@ -1119,7 +1119,7 @@ index 0d4495c6b9f..3444cfd3584 100644 2.44.0 -From c6acf2b72dfc920daedcbd035c595e450fe12155 Mon Sep 17 00:00:00 2001 +From b42e80d6f037cc9144e35db29f2ba200960a04f6 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 dd5b1c5691e..e3c21829d4b 100644 +index dd5b1c5691e1..e3c21829d4b3 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 dd5b1c5691e..e3c21829d4b 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 5c7538d498d..96dc5d8115d 100644 +index 5c7538d498dd..96dc5d8115d2 100644 --- a/drivers/usb/dwc2/hcd_intr.c +++ b/drivers/usb/dwc2/hcd_intr.c @@ -1935,7 +1935,8 @@ static void dwc2_hc_chhltd_intr_dma(struct dwc2_hsotg *hsotg, @@ -1190,7 +1190,7 @@ index 5c7538d498d..96dc5d8115d 100644 2.44.0 -From b4f64973d7f9f13a267169860447fbfe41f9e341 Mon Sep 17 00:00:00 2001 +From d491de8e7fdd79fc29a0203901fbc49e6799527d 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 94fe2f3836a..9a9e19fd1fb 100644 +index 94fe2f3836a9..9a9e19fd1fb3 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 94fe2f3836a..9a9e19fd1fb 100644 2.44.0 -From c84d57c87fde71513782d425eec0394e99887140 Mon Sep 17 00:00:00 2001 +From c475b4332e77b0e4cce408e1a45d4751f1bf9368 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 32c0f10765d..ea20818202f 100644 +index 32c0f10765dd..ea20818202fc 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi @@ -62,13 +62,13 @@ @@ -1276,7 +1276,7 @@ index 32c0f10765d..ea20818202f 100644 2.44.0 -From d15970ae0ed38cc6ce2f79d40959f554744369a5 Mon Sep 17 00:00:00 2001 +From 3abe7ab787695dd6fddf916f86081ae99ad1c8e4 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 a2c2b5203b0..9a63a0447d6 100644 +index a2c2b5203b0a..9a63a0447d6f 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -446,27 +446,6 @@ static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate, @@ -1342,7 +1342,7 @@ index a2c2b5203b0..9a63a0447d6 100644 2.44.0 -From 752c1a4a728b286fd08df8ce3e70cf9e89e9525a Mon Sep 17 00:00:00 2001 +From 03176c8ff01e1bb5d90a8827e5e3dc8543425a31 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 1cfa4eda5ab..bba671f0de4 100644 +index 1cfa4eda5abf..bba671f0de4f 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -378,8 +378,6 @@ @@ -1370,7 +1370,7 @@ index 1cfa4eda5ab..bba671f0de4 100644 2.44.0 -From f6e36c6dddffc452946f34f8fe18a10a902128be Mon Sep 17 00:00:00 2001 +From 0bbb453f0de3012599a5632f10585b286dba4ea7 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 0f17dfa8702..193cf8ed791 100644 +index 0f17dfa8702b..193cf8ed7912 100644 --- a/drivers/gpu/drm/drm_fourcc.c +++ b/drivers/gpu/drm/drm_fourcc.c @@ -299,6 +299,14 @@ const struct drm_format_info *__drm_format_info(u32 format) @@ -1420,7 +1420,7 @@ index 0f17dfa8702..193cf8ed791 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 8db7fd3f743..3151f1fc7eb 100644 +index 8db7fd3f743e..3151f1fc7ebb 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 8db7fd3f743..3151f1fc7eb 100644 2.44.0 -From 864048d216c352b65e4af61f8373941f732f666d Mon Sep 17 00:00:00 2001 +From 5447bf97fc3e236e40214028df9cf431b63d58ef 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 4b338cb89d3..ea5d96d8c55 100644 +index 4b338cb89d32..ea5d96d8c55c 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 4b338cb89d3..ea5d96d8c55 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 5f56e0597df..4b2daefeb8c 100644 +index 5f56e0597df8..4b2daefeb8c1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -186,6 +186,7 @@ struct vop_win_phy { @@ -1560,7 +1560,7 @@ index 5f56e0597df..4b2daefeb8c 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 7b280500677..f8cef0cb7bf 100644 +index 7b2805006776..f8cef0cb7bff 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 7b280500677..f8cef0cb7bf 100644 2.44.0 -From a529b32b992b0a7327acf5c3f1548210c42dc38a Mon Sep 17 00:00:00 2001 +From 2a60e08a1979993dbce7ceab6c037e4f0b060e3b 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 3a4b15a98e0..834b426da8b 100644 +index 3a4b15a98e02..834b426da8b1 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 3a4b15a98e0..834b426da8b 100644 2.44.0 -From 5f3861bba30640684d297d871461c4f33dbe5551 Mon Sep 17 00:00:00 2001 +From a72596b31bcf47752e5e3de755fe5bc9d9fce355 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 1840224faa4..4366cdcb970 100644 +index 1840224faa41..4366cdcb970e 100644 --- a/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst +++ b/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst @@ -79,6 +79,13 @@ All components are stored with the same number of bits per component. @@ -1996,7 +1996,7 @@ index 1840224faa4..4366cdcb970 100644 .. _V4L2-PIX-FMT-NV42: diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c -index 834b426da8b..c65ffab5800 100644 +index 834b426da8b1..c65ffab5800a 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 834b426da8b..c65ffab5800 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 f4d9d627909..a30d66f004c 100644 +index f4d9d6279094..a30d66f004c2 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1347,8 +1347,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -2026,7 +2026,7 @@ index f4d9d627909..a30d66f004c 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 78260e5d998..79b5ef45605 100644 +index 78260e5d9985..79b5ef45605c 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -638,8 +638,10 @@ struct v4l2_pix_format { @@ -2044,7 +2044,7 @@ index 78260e5d998..79b5ef45605 100644 2.44.0 -From c9100efb8ab9bd51ddee6a882931554178b2d994 Mon Sep 17 00:00:00 2001 +From 05c6970e34e5b2fa6ee73cbac268335de3977822 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 4fc167b42cf..7a1e76d423d 100644 +index 4fc167b42cf0..7a1e76d423df 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -896,9 +896,9 @@ static void config_registers(struct rkvdec_ctx *ctx, @@ -2103,7 +2103,7 @@ index 4fc167b42cf..7a1e76d423d 100644 2.44.0 -From 63177d0771f5acb308b188f1ba17769132e7a92f Mon Sep 17 00:00:00 2001 +From fc2097f2b7bd123473ab9ddf43ef5881f1077d8a 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 7a1e76d423d..8bce8902b8d 100644 +index 7a1e76d423df..8bce8902b8dd 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -655,13 +655,14 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx, @@ -2158,7 +2158,7 @@ index 7a1e76d423d..8bce8902b8d 100644 2.44.0 -From 60731070d452d050dd0433b24431e2f9892c7fca Mon Sep 17 00:00:00 2001 +From a33053166f12e98771cac9065a3d9d964e3d4c4a 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 8bce8902b8d..815d5359ddd 100644 +index 8bce8902b8dd..815d5359ddd5 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -1070,17 +1070,6 @@ static int rkvdec_h264_start(struct rkvdec_ctx *ctx) @@ -2223,7 +2223,7 @@ index 8bce8902b8d..815d5359ddd 100644 2.44.0 -From af21af6b0f024c668e956ab65c1eb1003cafa7e2 Mon Sep 17 00:00:00 2001 +From 17217b78f955253e88e664260865ce171678b48a 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 ac398b5a973..d1087519d21 100644 +index ac398b5a9736..d1087519d218 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,16 @@ @@ -2293,7 +2293,7 @@ index ac398b5a973..d1087519d21 100644 2.44.0 -From 6e68b1e3b12f13197bee794aa0aec3029da4a9fe Mon Sep 17 00:00:00 2001 +From 3ead693d90f96d1ae0536d5245da582f29e3a0ff 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 d1087519d21..7e59db3fc24 100644 +index d1087519d218..7e59db3fc24d 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 d1087519d21..7e59db3fc24 100644 2.44.0 -From de04caa6d63b4b8ef899be66a4fd5c5b91d53a6c Mon Sep 17 00:00:00 2001 +From 41220d9f4d949f76941c833c6396bee68a5b97b2 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 7e59db3fc24..efbf9aa578a 100644 +index 7e59db3fc24d..efbf9aa578ae 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,32 @@ @@ -2495,7 +2495,7 @@ index 7e59db3fc24..efbf9aa578a 100644 2.44.0 -From 760f009592b3bbb3efb40c4f67517dacb102937c Mon Sep 17 00:00:00 2001 +From 4a9ca698c526371e3363cb61a51e488315dbb9f9 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 efbf9aa578a..d8fb2d935ff 100644 +index efbf9aa578ae..d8fb2d935ffc 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,26 +27,42 @@ @@ -2618,7 +2618,7 @@ index efbf9aa578a..d8fb2d935ff 100644 return -EINVAL; diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index 633335ebb9c..6f8cf50c5d9 100644 +index 633335ebb9c4..6f8cf50c5d99 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -75,13 +75,23 @@ struct rkvdec_coded_fmt_ops { @@ -2658,7 +2658,7 @@ index 633335ebb9c..6f8cf50c5d9 100644 2.44.0 -From 9cbeda8f8d9ca5cc4412ac63097c5bd237f1811e Mon Sep 17 00:00:00 2001 +From ef3b58ac24467c71e766212518a5c0164b6823b1 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 d8fb2d935ff..455b9cd34b6 100644 +index d8fb2d935ffc..455b9cd34b6a 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 d8fb2d935ff..455b9cd34b6 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 6f8cf50c5d9..e466a2753cc 100644 +index 6f8cf50c5d99..e466a2753ccf 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -73,6 +73,8 @@ struct rkvdec_coded_fmt_ops { @@ -2759,7 +2759,7 @@ index 6f8cf50c5d9..e466a2753cc 100644 2.44.0 -From e7ff856f9dd839705041be1e344a367f6f343fce Mon Sep 17 00:00:00 2001 +From 54c30eea039b46169aa9597954980d8d7f15f26d 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 815d5359ddd..baac6d012dd 100644 +index 815d5359ddd5..baac6d012ddd 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -1027,24 +1027,42 @@ static int rkvdec_h264_adjust_fmt(struct rkvdec_ctx *ctx, @@ -2851,7 +2851,7 @@ index 815d5359ddd..baac6d012dd 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 455b9cd34b6..7d909d4a5d0 100644 +index 455b9cd34b6a..7d909d4a5d00 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 455b9cd34b6..7d909d4a5d0 100644 }; diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index e466a2753cc..9a9f4fced7a 100644 +index e466a2753ccf..9a9f4fced7a1 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -80,6 +80,9 @@ struct rkvdec_coded_fmt_ops { @@ -2951,7 +2951,7 @@ index e466a2753cc..9a9f4fced7a 100644 2.44.0 -From a63a8e5d9195f9c0d23b113eb484252cc7135a4d Mon Sep 17 00:00:00 2001 +From 06018c93c09663518d521ccfbce6a9e25383da70 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 cb86b429cfa..a77122641d1 100644 +index cb86b429cfaa..a77122641d14 100644 --- a/drivers/staging/media/rkvdec/Makefile +++ b/drivers/staging/media/rkvdec/Makefile @@ -1,3 +1,3 @@ @@ -2987,7 +2987,7 @@ index cb86b429cfa..a77122641d1 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 2c077938327..f089ef859e8 100644 +index 2c0779383276..f089ef859e8c 100644 --- a/drivers/staging/media/rkvdec/TODO +++ b/drivers/staging/media/rkvdec/TODO @@ -1,10 +1,3 @@ @@ -3003,7 +3003,7 @@ index 2c077938327..f089ef859e8 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 00000000000..eac4ea60494 +index 000000000000..eac4ea604949 --- /dev/null +++ b/drivers/staging/media/rkvdec/rkvdec-hevc-data.c @@ -0,0 +1,1848 @@ @@ -4857,7 +4857,7 @@ index 00000000000..eac4ea60494 +}; diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c new file mode 100644 -index 00000000000..0c4ddc073a6 +index 000000000000..0c4ddc073a6c --- /dev/null +++ b/drivers/staging/media/rkvdec/rkvdec-hevc.c @@ -0,0 +1,814 @@ @@ -5676,7 +5676,7 @@ index 00000000000..0c4ddc073a6 + .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 15b9bee9201..83bf790ed9b 100644 +index 15b9bee92016..83bf790ed9b7 100644 --- a/drivers/staging/media/rkvdec/rkvdec-regs.h +++ b/drivers/staging/media/rkvdec/rkvdec-regs.h @@ -43,6 +43,7 @@ @@ -5688,7 +5688,7 @@ index 15b9bee9201..83bf790ed9b 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 7d909d4a5d0..ca82ccda182 100644 +index 7d909d4a5d00..ca82ccda1825 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 7d909d4a5d0..ca82ccda182 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 9a9f4fced7a..2f3bda1df5f 100644 +index 9a9f4fced7a1..2f3bda1df5f0 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -138,6 +138,7 @@ void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run); @@ -5797,7 +5797,7 @@ index 9a9f4fced7a..2f3bda1df5f 100644 2.44.0 -From 3fa5d948a04b637f392a330b0a05a8dda80de9ad Mon Sep 17 00:00:00 2001 +From cd0936ca1b73bb7b6955fa2b56c6090f0718154f 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 ca82ccda182..768683747e8 100644 +index ca82ccda1825..768683747e8a 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -13,6 +13,7 @@ @@ -5894,7 +5894,7 @@ index ca82ccda182..768683747e8 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 2f3bda1df5f..14ce26a6c61 100644 +index 2f3bda1df5f0..14ce26a6c618 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -22,6 +22,10 @@ @@ -5939,7 +5939,7 @@ index 2f3bda1df5f..14ce26a6c61 100644 2.44.0 -From 42c7d103c51016940985bc6ebddaa23bf5ac88d1 Mon Sep 17 00:00:00 2001 +From 008039fe23bdf172678464315a9f67f8b17b46d9 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 768683747e8..6725c5f06d1 100644 +index 768683747e8a..6725c5f06d10 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 768683747e8..6725c5f06d1 100644 2.44.0 -From af110375c3f5f63e7bcc9430431459b4e87af1c1 Mon Sep 17 00:00:00 2001 +From b470745edd8b27c6cf89ae3d0f1dda626a7f7157 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 6725c5f06d1..ba5812707e0 100644 +index 6725c5f06d10..ba5812707e03 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 6725c5f06d1..ba5812707e0 100644 2.44.0 -From b4ab2e76b0b07db71b96cd272756a02d419d9a6d Mon Sep 17 00:00:00 2001 +From a905be049d8d4fd66a5ce86f0ff4ecbbe93f0ead 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 0c4ddc073a6..d0a1859d54c 100644 +index 0c4ddc073a6c..d0a1859d54c1 100644 --- a/drivers/staging/media/rkvdec/rkvdec-hevc.c +++ b/drivers/staging/media/rkvdec/rkvdec-hevc.c @@ -788,6 +788,15 @@ static int rkvdec_hevc_run(struct rkvdec_ctx *ctx) @@ -6178,7 +6178,7 @@ index 0c4ddc073a6..d0a1859d54c 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 83bf790ed9b..740bdb49863 100644 +index 83bf790ed9b7..740bdb498634 100644 --- a/drivers/staging/media/rkvdec/rkvdec-regs.h +++ b/drivers/staging/media/rkvdec/rkvdec-regs.h @@ -218,6 +218,8 @@ @@ -6191,7 +6191,7 @@ index 83bf790ed9b..740bdb49863 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 0e7e16f20ee..cadb9d59230 100644 +index 0e7e16f20eeb..cadb9d592308 100644 --- a/drivers/staging/media/rkvdec/rkvdec-vp9.c +++ b/drivers/staging/media/rkvdec/rkvdec-vp9.c @@ -824,6 +824,16 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx) @@ -6212,7 +6212,7 @@ index 0e7e16f20ee..cadb9d59230 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 ba5812707e0..e76a719e021 100644 +index ba5812707e03..e76a719e021c 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 ba5812707e0..e76a719e021 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 14ce26a6c61..1d5d405da56 100644 +index 14ce26a6c618..1d5d405da56c 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -26,6 +26,8 @@ @@ -6281,7 +6281,7 @@ index 14ce26a6c61..1d5d405da56 100644 2.44.0 -From 3ca71f7e03f3aa441f36a929644c2fe388c1087c Mon Sep 17 00:00:00 2001 +From d6b4d44bb221187acf35465d8a0308b3478c57af 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 08b02ec1675..0f00e9c8673 100644 +index 08b02ec16755..0f00e9c86737 100644 --- a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml +++ b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml @@ -16,7 +16,9 @@ description: |- @@ -6314,7 +6314,7 @@ index 08b02ec1675..0f00e9c8673 100644 2.44.0 -From dcd91e4e7a7c076f65f5bd21d08d482b0795dc38 Mon Sep 17 00:00:00 2001 +From 2e1e564f1fc5bdae3a295976bf2d16f71e660029 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 bba671f0de4..9065650080c 100644 +index bba671f0de4f..9065650080c1 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -1287,6 +1287,21 @@ @@ -6367,7 +6367,7 @@ index bba671f0de4..9065650080c 100644 2.44.0 -From 2b65a9d5cc008977534b06052b7c0c4557a41897 Mon Sep 17 00:00:00 2001 +From 07287aa0df640c7013fe838b3d3470e1fe59623e 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 a577f950c63..c75ce0a9b56 100644 +index a577f950c632..c75ce0a9b56e 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c @@ -679,7 +679,7 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap diff --git a/kernel.its b/kernel.its index 2f2faa2..e9c08b9 100644 --- a/kernel.its +++ b/kernel.its @@ -4,7 +4,7 @@ description = "Chrome OS kernel image with one or more FDT blobs"; #address-cells = <1>; images { - kernel@1 { + kernel { description = "kernel"; data = /incbin/("arch/arm/boot/zImage"); type = "kernel_noload"; @@ -14,22 +14,106 @@ load = <0>; entry = <0>; }; - fdt@1 { + fdt-veyron-brain { + description = "rk3288-veyron-brain.dtb"; + data = /incbin/("arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash { + algo = "sha1"; + }; + }; + fdt-veyron-jaq { + description = "rk3288-veyron-jaq.dtb"; + data = /incbin/("arch/arm/boot/dts/rockchip/rk3288-veyron-jaq.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash { + algo = "sha1"; + }; + }; + fdt-veyron-jerry { + description = "rk3288-veyron-jerry.dtb"; + data = /incbin/("arch/arm/boot/dts/rockchip/rk3288-veyron-jerry.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash { + algo = "sha1"; + }; + }; + fdt-veyron-mickey { + description = "rk3288-veyron-mickey.dtb"; + data = /incbin/("arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash { + algo = "sha1"; + }; + }; + fdt-veyron-minnie { + description = "rk3288-veyron-minnie.dtb"; + data = /incbin/("arch/arm/boot/dts/rockchip/rk3288-veyron-minnie.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash { + algo = "sha1"; + }; + }; + fdt-veyron-pinky { + description = "rk3288-veyron-pinky.dtb"; + data = /incbin/("arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dtb"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash { + algo = "sha1"; + }; + }; + fdt-veyron-speedy { description = "rk3288-veyron-speedy.dtb"; data = /incbin/("arch/arm/boot/dts/rockchip/rk3288-veyron-speedy.dtb"); type = "flat_dt"; arch = "arm"; compression = "none"; - hash@1 { + hash { algo = "sha1"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; + default = "conf-veyron-speedy"; + conf-veyron-brain { + kernel = "kernel"; + fdt = "fdt-veyron-brain"; + }; + conf-veyron-jaq { + kernel = "kernel"; + fdt = "fdt-veyron-jaq"; + }; + conf-veyron-jerry { + kernel = "kernel"; + fdt = "fdt-veryon-jerry"; + }; + conf-veyron-mickey { + kernel = "kernel"; + fdt = "fdt-veyron-mickey"; + }; + conf-veyron-minnie { + kernel = "kernel"; + fdt = "fdt-veyron-minnie"; + }; + conf-veyron-pinky { + kernel = "kernel"; + fdt = "fdt-veyron-pinky"; + }; + conf-veyron-speedy { + kernel = "kernel"; + fdt = "fdt-veyron-speedy"; }; }; };