summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViswanath Boma <quic_vboma@quicinc.com>2022-11-15 17:40:04 +0530
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2023-04-12 09:35:44 +0200
commitbfe1326573ff9ddd9032f556f0f5aba581b6688c (patch)
tree39d61d7605086dc869ba9e96104654749afbe126
parent50248ad9f190d527cbd578190ca769729518b703 (diff)
downloadlinux-stable-bfe1326573ff9ddd9032f556f0f5aba581b6688c.tar.gz
linux-stable-bfe1326573ff9ddd9032f556f0f5aba581b6688c.tar.bz2
linux-stable-bfe1326573ff9ddd9032f556f0f5aba581b6688c.zip
venus: Fix for H265 decoding failure.
Aligned the mismatch of persist1 and scratch1 buffer calculation, as per the firmware requirements. Signed-off-by: Vikash Garodia <vgarodia@qti.qualcomm.com> Signed-off-by: Viswanath Boma <quic_vboma@quicinc.com> Tested-by: Nathan Hebert <nhebert@chromium.org> Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c b/drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c
index ea25c451222b..a9be31ec6927 100644
--- a/drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c
+++ b/drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c
@@ -93,7 +93,7 @@
#define LCU_MIN_SIZE_PELS 16
#define SIZE_SEI_USERDATA 4096
-#define H265D_MAX_SLICE 600
+#define H265D_MAX_SLICE 3600
#define SIZE_H265D_HW_PIC_T SIZE_H264D_HW_PIC_T
#define SIZE_H265D_BSE_CMD_PER_BUF (16 * sizeof(u32))
#define SIZE_H265D_VPP_CMD_PER_BUF 256
@@ -1021,7 +1021,7 @@ static u32 h264d_persist1_size(void)
static u32 h265d_persist1_size(void)
{
return ALIGN((SIZE_SLIST_BUF_H265 * NUM_SLIST_BUF_H265 + H265_NUM_TILE
- * sizeof(u32)), HFI_DMA_ALIGNMENT);
+ * sizeof(u32) + NUM_HW_PIC_BUF * SIZE_SEI_USERDATA), HFI_DMA_ALIGNMENT);
}
static u32 vp8d_persist1_size(void)