From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
To: mchehab@kernel.org, hverkuil@xs4all.nl,
ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de,
gregkh@linuxfoundation.org, mripard@kernel.org,
paul.kocialkowski@bootlin.com, wens@csie.org,
jernej.skrabec@gmail.com, samuel@sholland.org,
nicolas.dufresne@collabora.com, andrzej.p@collabora.com
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-rockchip@lists.infradead.org,
linux-staging@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, kernel@collabora.com,
Benjamin Gaignard <benjamin.gaignard@collabora.com>
Subject: [PATCH 2/7] media: hantro: HEVC: Fix auxilary buffer size calculation
Date: Fri, 17 Jun 2022 13:57:57 +0200 [thread overview]
Message-ID: <20220617115802.396442-3-benjamin.gaignard@collabora.com> (raw)
In-Reply-To: <20220617115802.396442-1-benjamin.gaignard@collabora.com>
SAO and FILTER buffers size depend of the bit depth.
Make sure we have enough space for 10bit bitstreams.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
drivers/staging/media/hantro/hantro_hevc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/hantro/hantro_hevc.c b/drivers/staging/media/hantro/hantro_hevc.c
index dcb5c8703b6e..e06837108a09 100644
--- a/drivers/staging/media/hantro/hantro_hevc.c
+++ b/drivers/staging/media/hantro/hantro_hevc.c
@@ -104,7 +104,7 @@ static int tile_buffer_reallocate(struct hantro_ctx *ctx)
hevc_dec->tile_bsd.cpu = NULL;
}
- size = VERT_FILTER_RAM_SIZE * height64 * (num_tile_cols - 1);
+ size = (VERT_FILTER_RAM_SIZE * height64 * (num_tile_cols - 1) * ctx->bit_depth) / 8;
hevc_dec->tile_filter.cpu = dma_alloc_coherent(vpu->dev, size,
&hevc_dec->tile_filter.dma,
GFP_KERNEL);
@@ -112,7 +112,7 @@ static int tile_buffer_reallocate(struct hantro_ctx *ctx)
goto err_free_tile_buffers;
hevc_dec->tile_filter.size = size;
- size = VERT_SAO_RAM_SIZE * height64 * (num_tile_cols - 1);
+ size = (VERT_SAO_RAM_SIZE * height64 * (num_tile_cols - 1) * ctx->bit_depth) / 8;
hevc_dec->tile_sao.cpu = dma_alloc_coherent(vpu->dev, size,
&hevc_dec->tile_sao.dma,
GFP_KERNEL);
--
2.32.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-06-17 13:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-17 11:57 [PATCH 0/7] Enable 10bits bitstream for Hantro/G2 HEVC codec Benjamin Gaignard
2022-06-17 11:57 ` [PATCH 1/7] media: hantro: Store HEVC bit depth in context Benjamin Gaignard
2022-06-30 17:30 ` Ezequiel Garcia
2022-06-17 11:57 ` Benjamin Gaignard [this message]
2022-06-30 17:33 ` [PATCH 2/7] media: hantro: HEVC: Fix auxilary buffer size calculation Ezequiel Garcia
2022-06-17 11:57 ` [PATCH 3/7] media: hantro: HEVC: Fix chroma offset computation Benjamin Gaignard
2022-06-30 17:34 ` Ezequiel Garcia
2022-07-01 8:47 ` Paul Kocialkowski
2022-07-01 9:03 ` Benjamin Gaignard
2022-06-17 11:57 ` [PATCH 4/7] media: hantro: postproc: Configure output regs to support 10bit Benjamin Gaignard
2022-06-30 17:35 ` Ezequiel Garcia
2022-06-17 11:58 ` [PATCH 5/7] media: Hantro: HEVC: Allows 10-bit bitstream Benjamin Gaignard
2022-06-30 17:38 ` Ezequiel Garcia
2022-06-17 11:58 ` [PATCH 6/7] media: hantro: imx8m: Enable 10bit decoding Benjamin Gaignard
2022-06-30 17:40 ` Ezequiel Garcia
2022-07-01 7:01 ` Benjamin Gaignard
2022-07-04 15:43 ` Nicolas Dufresne
2022-06-17 11:58 ` [PATCH 7/7] media: hantro: Allows luma and chroma depth to be different Benjamin Gaignard
2022-06-30 17:40 ` Ezequiel Garcia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220617115802.396442-3-benjamin.gaignard@collabora.com \
--to=benjamin.gaignard@collabora.com \
--cc=andrzej.p@collabora.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=kernel@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=paul.kocialkowski@bootlin.com \
--cc=samuel@sholland.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox