mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 15:37:49 +00:00
linux (Allwinner): drop upstreamed patches
This commit is contained in:
parent
9f89140679
commit
a045445536
@ -1,32 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
||||||
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 <jernej.skrabec@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- 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
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
|||||||
From df20a1d7586c8986c986624ca8a9c322f524b515 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
||||||
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 <jernej.skrabec@gmail.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user