| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <c9788b3b-00a7-44a3-8e2b-56ea4581ee78@kernel.org>
Date: Fri, 31 Oct 2025 00:47:47 +0000
From: Bryan O'Donoghue <bod@...nel.org>
To: Deepa Guthyappa Madivalara <deepa.madivalara@....qualcomm.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Vikash Garodia <vikash.garodia@....qualcomm.com>,
Dikshita Agarwal <dikshita.agarwal@....qualcomm.com>,
Abhinav Kumar <abhinav.kumar@...ux.dev>
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-msm@...r.kernel.org, kernel test robot <lkp@...el.com>
Subject: Re: [PATCH v3 5/5] media: iris: Add internal buffer calculation for
AV1 decoder
On 30/10/2025 07:00, Deepa Guthyappa Madivalara wrote:
> Implement internal buffer count and size calculations for AV1 decoder
> for all the buffer types required by the AV1 decoder, including BIN,
> COMV, PERSIST, LINE, and PARTIAL.
>
> This ensures the hardware decoder has properly allocated memory for AV1
> decoding operations, enabling correct AV1 video playback.
>
> Signed-off-by: Deepa Guthyappa Madivalara <deepa.madivalara@....qualcomm.com>
> ---
> drivers/media/platform/qcom/iris/iris_buffer.h | 1 +
> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 297 ++++++++++++++++++++-
> drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 116 ++++++++
> 3 files changed, 411 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h
> index 5ef365d9236c7cbdee24a4614789b3191881968b..75bb767761824c4c02e0df9b765896cc093be333 100644
> --- a/drivers/media/platform/qcom/iris/iris_buffer.h
> +++ b/drivers/media/platform/qcom/iris/iris_buffer.h
> @@ -27,6 +27,7 @@ struct iris_inst;
> * @BUF_SCRATCH_1: buffer to store decoding/encoding context data for HW
> * @BUF_SCRATCH_2: buffer to store encoding context data for HW
> * @BUF_VPSS: buffer to store VPSS context data for HW
> + * @BUF_PARTIAL: buffer for AV1 IBC data
> * @BUF_TYPE_MAX: max buffer types
> */
> enum iris_buffer_type {
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> index 4463be05ce165adef6b152eb0c155d2e6a7b3c36..694f431cca98af945ac8afee41a0c2de6edac3ef 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> @@ -9,6 +9,17 @@
> #include "iris_hfi_gen2_defines.h"
>
> #define HFI_MAX_COL_FRAME 6
> +#define HFI_COLOR_FORMAT_YUV420_NV12_UBWC_Y_TILE_HEIGHT (8)
> +#define HFI_COLOR_FORMAT_YUV420_NV12_UBWC_Y_TILE_WIDTH (32)
> +#define HFI_COLOR_FORMAT_YUV420_NV12_UBWC_UV_TILE_HEIGHT (8)
> +#define HFI_COLOR_FORMAT_YUV420_NV12_UBWC_UV_TILE_WIDTH (16)
> +#define HFI_COLOR_FORMAT_YUV420_TP10_UBWC_Y_TILE_HEIGHT (4)
> +#define HFI_COLOR_FORMAT_YUV420_TP10_UBWC_Y_TILE_WIDTH (48)
> +#define HFI_COLOR_FORMAT_YUV420_TP10_UBWC_UV_TILE_HEIGHT (4)
> +#define HFI_COLOR_FORMAT_YUV420_TP10_UBWC_UV_TILE_WIDTH (24)
> +#define AV1D_SIZE_BSE_COL_MV_64x64 512
> +#define AV1D_SIZE_BSE_COL_MV_128x128 2816
> +
>
> #ifndef SYSTEM_LAL_TILE10
> #define SYSTEM_LAL_TILE10 192
> @@ -39,6 +50,31 @@ static u32 hfi_buffer_bin_h264d(u32 frame_width, u32 frame_height, u32 num_vpp_p
> return size_h264d_hw_bin_buffer(n_aligned_w, n_aligned_h, num_vpp_pipes);
> }
>
> +static u32 size_av1d_hw_bin_buffer(u32 frame_width, u32 frame_height, u32 num_vpp_pipes)
> +{
> + u32 size_yuv, size_bin_hdr, size_bin_res;
> +
> + size_yuv = ((frame_width * frame_height) <= BIN_BUFFER_THRESHOLD) ?
> + ((BIN_BUFFER_THRESHOLD * 3) >> 1) :
> + ((frame_width * frame_height * 3) >> 1);
> + size_bin_hdr = size_yuv * AV1_CABAC_HDR_RATIO_HD_TOT;
> + size_bin_res = size_yuv * AV1_CABAC_RES_RATIO_HD_TOT;
> + size_bin_hdr = ALIGN(size_bin_hdr / num_vpp_pipes,
> + DMA_ALIGNMENT) * num_vpp_pipes;
> + size_bin_res = ALIGN(size_bin_res / num_vpp_pipes,
> + DMA_ALIGNMENT) * num_vpp_pipes;
> +
> + return size_bin_hdr + size_bin_res;
> +}
> +
> +static u32 hfi_buffer_bin_av1d(u32 frame_width, u32 frame_height, u32 num_vpp_pipes)
> +{
> + u32 n_aligned_h = ALIGN(frame_height, 16);
> + u32 n_aligned_w = ALIGN(frame_width, 16);
> +
> + return size_av1d_hw_bin_buffer(n_aligned_w, n_aligned_h, num_vpp_pipes);
> +}
> +
> static u32 size_h265d_hw_bin_buffer(u32 frame_width, u32 frame_height, u32 num_vpp_pipes)
> {
> u32 product = frame_width * frame_height;
> @@ -110,6 +146,26 @@ static u32 hfi_buffer_comv_h265d(u32 frame_width, u32 frame_height, u32 _comv_bu
> return (_size * (_comv_bufcount)) + 512;
> }
>
> +static u32 num_lcu(u32 frame_width, u32 frame_height, u32 lcu_size)
> +{
> + return ((frame_width + lcu_size - 1) / lcu_size) *
> + ((frame_height + lcu_size - 1) / lcu_size);
> +}
> +
> +static u32 hfi_buffer_comv_av1d(u32 frame_width, u32 frame_height, u32 comv_bufcount)
> +{
> + u32 size;
> +
> + size = 2 * ALIGN(max(num_lcu(frame_width, frame_height, 64) *
> + AV1D_SIZE_BSE_COL_MV_64x64,
> + num_lcu(frame_width, frame_height, 128) *
> + AV1D_SIZE_BSE_COL_MV_128x128),
> + DMA_ALIGNMENT);
The formatting is all over the gaff.
> + size *= comv_bufcount;
> +
> + return size;
> +}
> +
> static u32 size_h264d_bse_cmd_buf(u32 frame_height)
> {
> u32 height = ALIGN(frame_height, 32);
> @@ -174,6 +230,20 @@ static u32 hfi_buffer_persist_h264d(void)
> DMA_ALIGNMENT);
> }
>
> +static u32 hfi_buffer_persist_av1d(u32 max_width, u32 max_height, u32 total_ref_count)
> +{
> + u32 comv_size, size;
> +
> + comv_size = hfi_buffer_comv_av1d(max_width, max_height, total_ref_count);
> + size = ALIGN((SIZE_AV1D_SEQUENCE_HEADER * 2 + SIZE_AV1D_METADATA +
> + AV1D_NUM_HW_PIC_BUF * (SIZE_AV1D_TILE_OFFSET + SIZE_AV1D_QM) +
> + AV1D_NUM_FRAME_HEADERS * (SIZE_AV1D_FRAME_HEADER +
> + 2 * SIZE_AV1D_PROB_TABLE) + comv_size + HDR10_HIST_EXTRADATA_SIZE +
> + SIZE_AV1D_METADATA * AV1D_NUM_HW_PIC_BUF), DMA_ALIGNMENT);
> +
> + return ALIGN(size, DMA_ALIGNMENT);
> +}
> +
> static u32 hfi_buffer_non_comv_h264d(u32 frame_width, u32 frame_height, u32 num_vpp_pipes)
> {
> u32 size_bse = size_h264d_bse_cmd_buf(frame_height);
> @@ -459,6 +529,182 @@ static u32 hfi_buffer_line_h264d(u32 frame_width, u32 frame_height,
> return ALIGN((size + vpss_lb_size), DMA_ALIGNMENT);
> }
>
> +static u32 size_av1d_lb_opb_wr1_nv12_ubwc(u32 frame_width, u32 frame_height)
> +{
> + u32 size, y_width, y_width_a = 128;
> +
> + y_width = ALIGN(frame_width, y_width_a);
> +
> + size = ((y_width + HFI_COLOR_FORMAT_YUV420_NV12_UBWC_Y_TILE_WIDTH - 1) /
> + HFI_COLOR_FORMAT_YUV420_NV12_UBWC_Y_TILE_WIDTH +
> + (AV1D_MAX_TILE_COLS - 1));
> + return size * 256;
Why 256 ?
You reuse this value at least one other time.
So it should be a define with a name that imparts a meaning to the
re/viewer.
> +}
> +
> +static u32 size_av1d_lb_opb_wr1_tp10_ubwc(u32 frame_width, u32 frame_height)
> +{
> + u32 size, y_width, y_width_a = 256;
> +
> + y_width = ALIGN(frame_width, y_width_a);
> +
> + size = ((y_width + HFI_COLOR_FORMAT_YUV420_TP10_UBWC_Y_TILE_WIDTH - 1) /
> + HFI_COLOR_FORMAT_YUV420_TP10_UBWC_Y_TILE_WIDTH +
> + (AV1D_MAX_TILE_COLS - 1));
> +
> + return size * 256;
> +}
> +
> +static u32 hfi_buffer_line_av1d(u32 frame_width, u32 frame_height,
> + bool is_opb, u32 num_vpp_pipes)
> +{
> + u32 size, vpss_lb_size, opbwrbufsize, opbwr8, opbwr10;
> +
> + size = ALIGN(size_av1d_lb_fe_top_data(frame_width, frame_height),
> + DMA_ALIGNMENT) +
> + ALIGN(size_av1d_lb_fe_top_ctrl(frame_width, frame_height),
> + DMA_ALIGNMENT) +
> + ALIGN(size_av1d_lb_fe_left_data(frame_width, frame_height),
> + DMA_ALIGNMENT) * num_vpp_pipes +
> + ALIGN(size_av1d_lb_fe_left_ctrl(frame_width, frame_height),
> + DMA_ALIGNMENT) * num_vpp_pipes +
> + ALIGN(size_av1d_lb_se_left_ctrl(frame_width, frame_height),
> + DMA_ALIGNMENT) * num_vpp_pipes +
> + ALIGN(size_av1d_lb_se_top_ctrl(frame_width, frame_height),
> + DMA_ALIGNMENT) +
> + ALIGN(size_av1d_lb_pe_top_data(frame_width, frame_height),
> + DMA_ALIGNMENT) +
> + ALIGN(size_av1d_lb_vsp_top(frame_width, frame_height),
> + DMA_ALIGNMENT) +
> + ALIGN(size_av1d_lb_recon_dma_metadata_wr
> + (frame_width, frame_height), DMA_ALIGNMENT) * 2 +
> + ALIGN(size_av1d_qp(frame_width, frame_height), DMA_ALIGNMENT);
> + opbwr8 = size_av1d_lb_opb_wr1_nv12_ubwc(frame_width, frame_height);
> + opbwr10 = size_av1d_lb_opb_wr1_tp10_ubwc(frame_width, frame_height);
> + opbwrbufsize = opbwr8 >= opbwr10 ? opbwr8 : opbwr10;
> + size = ALIGN((size + opbwrbufsize), DMA_ALIGNMENT);
> + if (is_opb) {
> + vpss_lb_size = size_vpss_lb(frame_width, frame_height);
> + size = ALIGN((size + vpss_lb_size) * 2, DMA_ALIGNMENT);
> + }
> +
> + return size;
> +}
> +
> +static u32 size_av1d_ibc_nv12_ubwc(u32 frame_width, u32 frame_height)
> +{
> + u32 size;
> + u32 y_width_a = 128, y_height_a = 32;
> + u32 uv_width_a = 128, uv_height_a = 32;
> + u32 ybufsize, uvbufsize, y_width, y_height, uv_width, uv_height;
> + u32 y_meta_width_a = 64, y_meta_height_a = 16;
> + u32 uv_meta_width_a = 64, uv_meta_height_a = 16;
> + u32 meta_height, meta_stride, meta_size;
> + u32 tile_width_y = HFI_COLOR_FORMAT_YUV420_NV12_UBWC_Y_TILE_WIDTH;
> + u32 tile_height_y = HFI_COLOR_FORMAT_YUV420_NV12_UBWC_Y_TILE_HEIGHT;
> + u32 tile_width_uv = HFI_COLOR_FORMAT_YUV420_NV12_UBWC_UV_TILE_WIDTH;
> + u32 tile_height_uv = HFI_COLOR_FORMAT_YUV420_NV12_UBWC_UV_TILE_HEIGHT;
> +
> + y_width = ALIGN(frame_width, y_width_a);
> + y_height = ALIGN(frame_height, y_height_a);
> + uv_width = ALIGN(frame_width, uv_width_a);
> + uv_height = ALIGN(((frame_height + 1) >> 1), uv_height_a);
> + ybufsize = ALIGN((y_width * y_height), HFI_ALIGNMENT_4096);
> + uvbufsize = ALIGN(uv_width * uv_height, HFI_ALIGNMENT_4096);
> + size = ybufsize + uvbufsize;
> + meta_stride = ALIGN(((frame_width + (tile_width_y - 1)) / tile_width_y),
> + y_meta_width_a);
> + meta_height = ALIGN(((frame_height + (tile_height_y - 1)) / tile_height_y),
> + y_meta_height_a);
> + meta_size = ALIGN(meta_stride * meta_height, HFI_ALIGNMENT_4096);
> + size += meta_size;
> + meta_stride = ALIGN(((((frame_width + 1) >> 1) + (tile_width_uv - 1)) /
> + tile_width_uv), uv_meta_width_a);
> + meta_height = ALIGN(((((frame_height + 1) >> 1) + (tile_height_uv - 1)) /
> + tile_height_uv), uv_meta_height_a);
> + meta_size = ALIGN(meta_stride * meta_height, HFI_ALIGNMENT_4096);
> + size += meta_size;
> +
> + return size;
> +}
> +
> +static u32 hfi_yuv420_tp10_calc_y_stride(u32 frame_width, u32 stride_multiple)
> +{
> + u32 stride;
> +
> + stride = ALIGN(frame_width, 192);
> + stride = ALIGN(stride * 4 / 3, stride_multiple);
> +
> + return stride;
> +}
> +
> +static u32 hfi_yuv420_tp10_calc_y_bufheight(u32 frame_height, u32 min_buf_height_multiple)
> +{
> + return ALIGN(frame_height, min_buf_height_multiple);
> +}
> +
> +static u32 hfi_yuv420_tp10_calc_uv_stride(u32 frame_width, u32 stride_multiple)
> +{
> + u32 stride;
> +
> + stride = ALIGN(frame_width, 192);
> + stride = ALIGN(stride * 4 / 3, stride_multiple);
> +
> + return stride;
> +}
> +
> +static u32 hfi_yuv420_tp10_calc_uv_bufheight(u32 frame_height, u32 min_buf_height_multiple)
> +{
> + return ALIGN(((frame_height + 1) >> 1), min_buf_height_multiple);
> +}
> +
> +static u32 size_av1d_ibc_tp10_ubwc(u32 frame_width, u32 frame_height)
> +{
> + u32 size;
> + u32 y_width_a = 256, y_height_a = 16,
> + uv_width_a = 256, uv_height_a = 16;
> + u32 ybufsize, uvbufsize, y_width, y_height, uv_width, uv_height;
> + u32 y_meta_width_a = 64, y_meta_height_a = 16,
> + uv_meta_width_a = 64, uv_meta_height_a = 16;
> + u32 meta_height, meta_stride, meta_size;
> + u32 tile_width_y = HFI_COLOR_FORMAT_YUV420_TP10_UBWC_Y_TILE_WIDTH;
> + u32 tile_height_y = HFI_COLOR_FORMAT_YUV420_TP10_UBWC_Y_TILE_HEIGHT;
> + u32 tile_width_uv = HFI_COLOR_FORMAT_YUV420_TP10_UBWC_UV_TILE_WIDTH;
> + u32 tile_height_uv = HFI_COLOR_FORMAT_YUV420_TP10_UBWC_UV_TILE_HEIGHT;
> +
> + y_width = hfi_yuv420_tp10_calc_y_stride(frame_width, y_width_a);
> + y_height = hfi_yuv420_tp10_calc_y_bufheight(frame_height, y_height_a);
> + uv_width = hfi_yuv420_tp10_calc_uv_stride(frame_width, uv_width_a);
> + uv_height = hfi_yuv420_tp10_calc_uv_bufheight(frame_height, uv_height_a);
> + ybufsize = ALIGN(y_width * y_height, HFI_ALIGNMENT_4096);
> + uvbufsize = ALIGN(uv_width * uv_height, HFI_ALIGNMENT_4096);
> + size = ybufsize + uvbufsize;
> + meta_stride = ALIGN(((frame_width + (tile_width_y - 1)) / tile_width_y),
> + y_meta_width_a);
> + meta_height = ALIGN(((frame_height + (tile_height_y - 1)) / tile_height_y),
> + y_meta_height_a);
> + meta_size = ALIGN(meta_stride * meta_height, HFI_ALIGNMENT_4096);
> + size += meta_size;
> + meta_stride = ALIGN(((((frame_width + 1) >> 1) + (tile_width_uv - 1)) /
> + tile_width_uv), uv_meta_width_a);
> + meta_height = ALIGN(((((frame_height + 1) >> 1) + (tile_height_uv - 1)) /
> + tile_height_uv), uv_meta_height_a);
> + meta_size = ALIGN(meta_stride * meta_height, HFI_ALIGNMENT_4096);
> + size += meta_size;
> +
> + return size;
> +}
> +
> +static u32 hfi_buffer_ibc_av1d(u32 frame_width, u32 frame_height)
> +{
> + u32 size, ibc8, ibc10;
> +
> + ibc8 = size_av1d_ibc_nv12_ubwc(frame_width, frame_height);
> + ibc10 = size_av1d_ibc_tp10_ubwc(frame_width, frame_height);
> + size = ibc8 >= ibc10 ? ibc8 : ibc10;
> +
> + return ALIGN(size, DMA_ALIGNMENT);
> +}
> +
> static u32 iris_vpu_dec_bin_size(struct iris_inst *inst)
> {
> u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
> @@ -472,6 +718,8 @@ static u32 iris_vpu_dec_bin_size(struct iris_inst *inst)
> return hfi_buffer_bin_h265d(width, height, num_vpp_pipes);
> else if (inst->codec == V4L2_PIX_FMT_VP9)
> return hfi_buffer_bin_vp9d(width, height, num_vpp_pipes);
> + else if (inst->codec == V4L2_PIX_FMT_AV1)
> + return hfi_buffer_bin_av1d(width, height, num_vpp_pipes);
>
> return 0;
> }
> @@ -487,18 +735,34 @@ static u32 iris_vpu_dec_comv_size(struct iris_inst *inst)
> return hfi_buffer_comv_h264d(width, height, num_comv);
> else if (inst->codec == V4L2_PIX_FMT_HEVC)
> return hfi_buffer_comv_h265d(width, height, num_comv);
> + else if (inst->codec == V4L2_PIX_FMT_AV1) {
> + if (inst->fw_caps[DRAP].value)
> + return 0;
> + else
> + return hfi_buffer_comv_av1d(width, height, num_comv);
> + }
>
> return 0;
> }
>
> static u32 iris_vpu_dec_persist_size(struct iris_inst *inst)
> {
> + struct platform_inst_caps *caps;
> +
> if (inst->codec == V4L2_PIX_FMT_H264)
> return hfi_buffer_persist_h264d();
> else if (inst->codec == V4L2_PIX_FMT_HEVC)
> return hfi_buffer_persist_h265d(0);
> else if (inst->codec == V4L2_PIX_FMT_VP9)
> return hfi_buffer_persist_vp9d();
> + else if (inst->codec == V4L2_PIX_FMT_AV1) {
> + caps = inst->core->iris_platform_data->inst_caps;
> + if (inst->fw_caps[DRAP].value)
> + return hfi_buffer_persist_av1d(caps->max_frame_width,
> + caps->max_frame_height, 16);
> + else
> + return hfi_buffer_persist_av1d(0, 0, 0);
> + }
>
> return 0;
> }
> @@ -545,6 +809,8 @@ static u32 iris_vpu_dec_line_size(struct iris_inst *inst)
> else if (inst->codec == V4L2_PIX_FMT_VP9)
> return hfi_buffer_line_vp9d(width, height, out_min_count, is_opb,
> num_vpp_pipes);
> + else if (inst->codec == V4L2_PIX_FMT_AV1)
> + return hfi_buffer_line_av1d(width, height, is_opb, num_vpp_pipes);
>
> return 0;
> }
> @@ -653,6 +919,15 @@ static u32 iris_vpu_enc_bin_size(struct iris_inst *inst)
> num_vpp_pipes, inst->hfi_rc_type);
> }
>
> +static u32 iris_vpu_dec_partial_size(struct iris_inst *inst)
> +{
> + struct v4l2_format *f = inst->fmt_src;
> + u32 height = f->fmt.pix_mp.height;
> + u32 width = f->fmt.pix_mp.width;
> +
> + return hfi_buffer_ibc_av1d(width, height);
> +}
> +
> static inline
> u32 hfi_buffer_comv_enc(u32 frame_width, u32 frame_height, u32 lcu_size,
> u32 num_recon, u32 standard)
> @@ -1414,7 +1689,9 @@ static int output_min_count(struct iris_inst *inst)
>
> /* fw_min_count > 0 indicates reconfig event has already arrived */
> if (inst->fw_min_count) {
> - if (iris_split_mode_enabled(inst) && inst->codec == V4L2_PIX_FMT_VP9)
> + if (iris_split_mode_enabled(inst) &&
> + (inst->codec == V4L2_PIX_FMT_VP9 ||
> + inst->codec == V4L2_PIX_FMT_AV1))
> return min_t(u32, 4, inst->fw_min_count);
> else
> return inst->fw_min_count;
> @@ -1422,6 +1699,8 @@ static int output_min_count(struct iris_inst *inst)
>
> if (inst->codec == V4L2_PIX_FMT_VP9)
> output_min_count = 9;
> + else if (inst->codec == V4L2_PIX_FMT_AV1)
> + output_min_count = 11;
>
> return output_min_count;
> }
> @@ -1444,6 +1723,7 @@ u32 iris_vpu_buf_size(struct iris_inst *inst, enum iris_buffer_type buffer_type)
> {BUF_PERSIST, iris_vpu_dec_persist_size },
> {BUF_DPB, iris_vpu_dec_dpb_size },
> {BUF_SCRATCH_1, iris_vpu_dec_scratch1_size },
> + {BUF_PARTIAL, iris_vpu_dec_partial_size },
> };
>
> static const struct iris_vpu_buf_type_handle enc_internal_buf_type_handle[] = {
> @@ -1510,14 +1790,20 @@ static u32 internal_buffer_count(struct iris_inst *inst,
> buffer_type == BUF_PERSIST) {
> return 1;
> } else if (buffer_type == BUF_COMV || buffer_type == BUF_NON_COMV) {
> - if (inst->codec == V4L2_PIX_FMT_H264 || inst->codec == V4L2_PIX_FMT_HEVC)
> + if (inst->codec == V4L2_PIX_FMT_H264 ||
> + inst->codec == V4L2_PIX_FMT_HEVC ||
> + inst->codec == V4L2_PIX_FMT_AV1)
> return 1;
> }
> +
> return 0;
> }
>
> static inline int iris_vpu_dpb_count(struct iris_inst *inst)
> {
> + if (inst->codec == V4L2_PIX_FMT_AV1)
> + return 11;
> +
> if (iris_split_mode_enabled(inst)) {
> return inst->fw_min_count ?
> inst->fw_min_count : inst->buffers[BUF_OUTPUT].min_count;
> @@ -1536,9 +1822,13 @@ int iris_vpu_buf_count(struct iris_inst *inst, enum iris_buffer_type buffer_type
> return MIN_BUFFERS;
> else
> return output_min_count(inst);
> + case BUF_NON_COMV:
> + if (inst->codec == V4L2_PIX_FMT_AV1)
> + return 0;
> + else
> + return 1;
> case BUF_BIN:
> case BUF_COMV:
> - case BUF_NON_COMV:
> case BUF_LINE:
> case BUF_PERSIST:
> return internal_buffer_count(inst, buffer_type);
> @@ -1546,6 +1836,7 @@ int iris_vpu_buf_count(struct iris_inst *inst, enum iris_buffer_type buffer_type
> case BUF_SCRATCH_2:
> case BUF_VPSS:
> case BUF_ARP:
> + case BUF_PARTIAL:
> return 1; /* internal buffer count needed by firmware is 1 */
> case BUF_DPB:
> return iris_vpu_dpb_count(inst);
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> index 04f0b7400a1e4e1d274d690a2761b9e57778e8b7..a8ffc1286260bddbf49df18fba0a23f78056a484 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> @@ -11,6 +11,7 @@ struct iris_inst;
> #define MIN_BUFFERS 4
>
> #define DMA_ALIGNMENT 256
> +#define HFI_ALIGNMENT_4096 4096
>
> #define NUM_HW_PIC_BUF 32
> #define LCU_MAX_SIZE_PELS 64
> @@ -81,6 +82,22 @@ struct iris_inst;
> #define MAX_PE_NBR_DATA_LCU64_LINE_BUFFER_SIZE 384
> #define MAX_FE_NBR_DATA_LUMA_LINE_BUFFER_SIZE 640
>
> +#define AV1_CABAC_HDR_RATIO_HD_TOT 2
> +#define AV1_CABAC_RES_RATIO_HD_TOT 2
> +#define AV1D_LCU_MAX_SIZE_PELS 128
> +#define AV1D_LCU_MIN_SIZE_PELS 64
> +#define AV1D_MAX_TILE_COLS 64
> +#define MAX_PE_NBR_DATA_LCU32_LINE_BUFFER_SIZE 192
> +#define MAX_PE_NBR_DATA_LCU16_LINE_BUFFER_SIZE 96
> +#define AV1D_NUM_HW_PIC_BUF 16
> +#define AV1D_NUM_FRAME_HEADERS 16
> +#define SIZE_AV1D_SEQUENCE_HEADER 768
> +#define SIZE_AV1D_METADATA 512
> +#define SIZE_AV1D_FRAME_HEADER 1280
> +#define SIZE_AV1D_TILE_OFFSET 65536
> +#define SIZE_AV1D_QM 3328
> +#define SIZE_AV1D_PROB_TABLE 22784
Cool, thank you.
> +
> #define SIZE_SLICE_CMD_BUFFER (ALIGN(20480, 256))
> #define SIZE_SPS_PPS_SLICE_HDR (2048 + 4096)
> #define SIZE_BSE_SLICE_CMD_BUF ((((8192 << 2) + 7) & (~7)) * 3)
> @@ -101,6 +118,15 @@ struct iris_inst;
> #define NUM_MBS_4K (DIV_ROUND_UP(MAX_WIDTH, 16) * DIV_ROUND_UP(MAX_HEIGHT, 16))
> #define NUM_MBS_720P (((ALIGN(1280, 16)) >> 4) * ((ALIGN(736, 16)) >> 4))
>
> +#define BITS_PER_PIX 16
> +#define NUM_LINES_LUMA 10
> +#define NUM_LINES_CHROMA 6
> +#define AV1D_LCU_MAX_SIZE_PELS 128
> +#define AV1D_LCU_MIN_SIZE_PELS 64
> +#define AV1D_MAX_TILE_COLS 64
> +#define BITS_PER_CTRL_PACK 128
> +#define NUM_CTRL_PACK_LCU 10
> +
> static inline u32 size_h264d_lb_fe_top_data(u32 frame_width)
> {
> return MAX_FE_NBR_DATA_LUMA_LINE_BUFFER_SIZE * ALIGN(frame_width, 16) * 3;
> @@ -146,6 +172,96 @@ static inline u32 size_h264d_qp(u32 frame_width, u32 frame_height)
> return DIV_ROUND_UP(frame_width, 64) * DIV_ROUND_UP(frame_height, 64) * 128;
> }
>
> +static inline u32 size_av1d_lb_fe_top_data(u32 frame_width, u32 frame_height)
> +{
> + return (ALIGN(frame_width, AV1D_LCU_MAX_SIZE_PELS) *
> + ((BITS_PER_PIX * NUM_LINES_LUMA) >> 3) +
> + ALIGN(frame_width, AV1D_LCU_MAX_SIZE_PELS) / 2 *
> + ((BITS_PER_PIX * NUM_LINES_CHROMA) >> 3) * 2);
> +}
> +
> +static inline u32 size_av1d_lb_fe_left_data(u32 frame_width, u32 frame_height)
> +{
> + return (32 * (ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) +
> + ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) /
> + AV1D_LCU_MIN_SIZE_PELS * 16) +
> + 16 * (ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) / 2 +
> + ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) /
> + AV1D_LCU_MIN_SIZE_PELS * 8) * 2 +
> + 24 * (ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) +
> + ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) /
> + AV1D_LCU_MIN_SIZE_PELS * 16) +
> + 24 * (ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) / 2 +
> + ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) /
> + AV1D_LCU_MIN_SIZE_PELS * 12) * 2 +
> + 24 * (ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) +
> + ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) /
> + AV1D_LCU_MIN_SIZE_PELS * 16) +
> + 16 * (ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) +
> + ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) /
> + AV1D_LCU_MIN_SIZE_PELS * 16) +
> + 16 * (ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) / 2 +
> + ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) /
> + AV1D_LCU_MIN_SIZE_PELS * 12) * 2);
> +}
> +
> +static inline u32 size_av1d_lb_fe_top_ctrl(u32 frame_width, u32 frame_height)
> +{
> + return (NUM_CTRL_PACK_LCU * ((frame_width + AV1D_LCU_MIN_SIZE_PELS - 1) /
> + AV1D_LCU_MIN_SIZE_PELS) * BITS_PER_CTRL_PACK / 8);
> +}
> +
> +static inline u32 size_av1d_lb_fe_left_ctrl(u32 frame_width, u32 frame_height)
> +{
> + return (16 * ((ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) / 16) +
> + (ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) /
> + AV1D_LCU_MIN_SIZE_PELS)) +
> + 3 * 16 * (ALIGN(frame_height, AV1D_LCU_MAX_SIZE_PELS) /
> + AV1D_LCU_MIN_SIZE_PELS));
> +}
> +
> +static inline u32 size_av1d_lb_se_top_ctrl(u32 frame_width, u32 frame_height)
> +{
> + return (((frame_width + 7) / 8) * MAX_SE_NBR_CTRL_LCU16_LINE_BUFFER_SIZE);
> +}
> +
> +static inline u32 size_av1d_lb_se_left_ctrl(u32 frame_width, u32 frame_height)
> +{
> + return (max(((frame_height + 15) / 16) *
> + MAX_SE_NBR_CTRL_LCU16_LINE_BUFFER_SIZE,
> + max(((frame_height + 31) / 32) *
> + MAX_SE_NBR_CTRL_LCU32_LINE_BUFFER_SIZE,
> + ((frame_height + 63) / 64) *
> + MAX_SE_NBR_CTRL_LCU64_LINE_BUFFER_SIZE)));
> +}
> +
> +static inline u32 size_av1d_lb_pe_top_data(u32 frame_width, u32 frame_height)
> +{
> + return (max(((frame_width + 15) / 16) *
> + MAX_PE_NBR_DATA_LCU16_LINE_BUFFER_SIZE,
> + max(((frame_width + 31) / 32) *
> + MAX_PE_NBR_DATA_LCU32_LINE_BUFFER_SIZE,
> + ((frame_width + 63) / 64) *
> + MAX_PE_NBR_DATA_LCU64_LINE_BUFFER_SIZE)));
This indentation can't be right - look at se_left_ctrl.
Please have another go through this code and fix your indentation.
0004-media-iris-Define-AV1-specific-platform-capabilities.patch has no
obvious style problems and is ready for submission.
0004-media-iris-Define-AV1-specific-platform-capabilities.patch:635:
filp ==> flip
total: 0 errors, 0 warnings, 0 checks, 555 lines checked
> +}
> +
> +static inline u32 size_av1d_lb_vsp_top(u32 frame_width, u32 frame_height)
> +{
> + return (max(((frame_width + 63) / 64) * 1280,
> + ((frame_width + 127) / 128) * 2304));
> +}
> +
> +static inline u32 size_av1d_lb_recon_dma_metadata_wr(u32 frame_width,
> + u32 frame_height)
> +{
> + return ((ALIGN(frame_height, 8) / (4 / 2)) * 64);
> +}
> +
> +static inline u32 size_av1d_qp(u32 frame_width, u32 frame_height)
> +{
> + return size_h264d_qp(frame_width, frame_height);
> +}
> +
> u32 iris_vpu_buf_size(struct iris_inst *inst, enum iris_buffer_type buffer_type);
> u32 iris_vpu33_buf_size(struct iris_inst *inst, enum iris_buffer_type buffer_type);
> int iris_vpu_buf_count(struct iris_inst *inst, enum iris_buffer_type buffer_type);
>
> --
> 2.34.1
>
Powered by blists - more mailing lists