diff --git a/projects/Allwinner/patches/linux/0087-media-hantro-sunxi-Fix-VP9-steps.patch b/projects/Allwinner/patches/linux/0087-media-hantro-sunxi-Fix-VP9-steps.patch deleted file mode 100644 index 77eaa31a2a..0000000000 --- a/projects/Allwinner/patches/linux/0087-media-hantro-sunxi-Fix-VP9-steps.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 837c5a2d79984be3732751b1bfc6ec609ba82e2b Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Fri, 28 Jan 2022 17:03:04 +0100 -Subject: [PATCH] media: hantro: sunxi: Fix VP9 steps - -It turns out postproc for VP9 needs width and height to be multiple of -32. - -Signed-off-by: Jernej Skrabec ---- - drivers/staging/media/hantro/sunxi_vpu_hw.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/staging/media/hantro/sunxi_vpu_hw.c b/drivers/staging/media/hantro/sunxi_vpu_hw.c -index 90633406c4eb..c0edd5856a0c 100644 ---- a/drivers/staging/media/hantro/sunxi_vpu_hw.c -+++ b/drivers/staging/media/hantro/sunxi_vpu_hw.c -@@ -29,10 +29,10 @@ static const struct hantro_fmt sunxi_vpu_dec_fmts[] = { - .frmsize = { - .min_width = 48, - .max_width = 3840, -- .step_width = MB_DIM, -+ .step_width = 32, - .min_height = 48, - .max_height = 2160, -- .step_height = MB_DIM, -+ .step_height = 32, - }, - }, - }; --- -2.35.0 - diff --git a/projects/Allwinner/patches/linux/0088-media-cedrus-Fix-H265-aux-buffer-size.patch b/projects/Allwinner/patches/linux/0088-media-cedrus-Fix-H265-aux-buffer-size.patch deleted file mode 100644 index 415c6062e2..0000000000 --- a/projects/Allwinner/patches/linux/0088-media-cedrus-Fix-H265-aux-buffer-size.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Wed, 9 Feb 2022 19:03:06 +0100 -Subject: [PATCH] media: cedrus: Fix H265 aux buffer size - -Neighbour info buffer size needs to be 794 kiB in size on H6. This is -actually mentioned in comment, but smaller size is used nevertheless. - -Increase buffer size to conform H6 needs. Since increase is not that big -in absolute numbers, it doesn't make sense to complicate logic for older -generations. - -Bug was discovered using iommu, which reported access error when trying -to play H265 video. - -Fixes: 86caab29da78 ("media: cedrus: Add HEVC/H.265 decoding support") -Signed-off-by: Jernej Skrabec ---- - drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c -index dec519bc55d4..ef51ddf9d0d7 100644 ---- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c -+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c -@@ -23,7 +23,7 @@ - * Subsequent BSP implementations seem to double the neighbor info buffer size - * for the H6 SoC, which may be related to 10 bit H265 support. - */ --#define CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE (397 * SZ_1K) -+#define CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE (794 * SZ_1K) - #define CEDRUS_H265_ENTRY_POINTS_BUF_SIZE (4 * SZ_1K) - #define CEDRUS_H265_MV_COL_BUF_UNIT_CTB_SIZE 160 - diff --git a/projects/Allwinner/patches/linux/0090-media-cedrus-h264-Fix-neighbour-info-buffer-size.patch b/projects/Allwinner/patches/linux/0090-media-cedrus-h264-Fix-neighbour-info-buffer-size.patch deleted file mode 100644 index b382e66f95..0000000000 --- a/projects/Allwinner/patches/linux/0090-media-cedrus-h264-Fix-neighbour-info-buffer-size.patch +++ /dev/null @@ -1,38 +0,0 @@ -From df20a1d7586c8986c986624ca8a9c322f524b515 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Mon, 14 Feb 2022 20:01:26 +0100 -Subject: [PATCH] media: cedrus: h264: Fix neighbour info buffer size - -According to BSP library source, H264 neighbour info buffer size needs -to be 32 kiB for H6. This is similar to H265 decoding, which also needs -double buffer size in comparison to older Cedrus core generations. - -Increase buffer size to cover H6 needs. Since increase is not that big -in absolute numbers, it doesn't make sense to complicate logic for older -generations. - -Issue was discovered using iommu and cross checked with BSP library -source. - -Fixes: 6eb9b758e307 ("media: cedrus: Add H264 decoding support") -Signed-off-by: Jernej Skrabec ---- - drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c -index b4173a8926d6..d8fb93035470 100644 ---- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c -+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c -@@ -38,7 +38,7 @@ struct cedrus_h264_sram_ref_pic { - - #define CEDRUS_H264_FRAME_NUM 18 - --#define CEDRUS_NEIGHBOR_INFO_BUF_SIZE (16 * SZ_1K) -+#define CEDRUS_NEIGHBOR_INFO_BUF_SIZE (32 * SZ_1K) - #define CEDRUS_MIN_PIC_INFO_BUF_SIZE (130 * SZ_1K) - - static void cedrus_h264_write_sram(struct cedrus_dev *dev, --- -2.35.1 -