Hi,
On Thu, May 30, 2019 at 11:15:15PM +0200, Jernej Skrabec wrote:
> H264 and HEVC engines need additional buffers for each capture buffer.
> H264 engine has this currently solved by allocating fixed size pool,
> which is not ideal. Most of the time pool size is much bigger than it
> needs to be.
>
> Ideally, extra buffer should be allocated at buffer initialization, but
> that's not efficient. It's size in H264 depends on flags set in SPS, but
> that information is not available in buffer init callback.
>
> Signed-off-by: Jernej Skrabec <jernej.skrabec@xxxxxxxx>
> ---
> drivers/staging/media/sunxi/cedrus/cedrus.h | 4 ++++
> .../staging/media/sunxi/cedrus/cedrus_video.c | 19 +++++++++++++++++++
> 2 files changed, 23 insertions(+)
>
> diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
> index d8e6777e5e27..16c1bdfd243a 100644
> --- a/drivers/staging/media/sunxi/cedrus/cedrus.h
> +++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
> @@ -81,6 +81,10 @@ struct cedrus_run {
> struct cedrus_buffer {
> struct v4l2_m2m_buffer m2m_buf;
>
> + void *extra_buf;
> + dma_addr_t extra_buf_dma;
> + ssize_t extra_buf_size;
> +
> union {
> struct {
> unsigned int position;
> diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
> index 681dfe3367a6..d756e0e69634 100644
> --- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
> +++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
> @@ -411,6 +411,24 @@ static void cedrus_queue_cleanup(struct vb2_queue *vq, u32 state)
> }
> }
>
> +static void cedrus_buf_cleanup(struct vb2_buffer *vb)
> +{
> + struct vb2_queue *vq = vb->vb2_queue;
> +
> + if (!V4L2_TYPE_IS_OUTPUT(vq->type)) {
> + struct cedrus_ctx *ctx = vb2_get_drv_priv(vq);
> + struct cedrus_buffer *cedrus_buf;
> +
> + cedrus_buf = vb2_to_cedrus_buffer(vq->bufs[vb->index]);
> +
> + if (cedrus_buf->extra_buf_size)
> + dma_free_coherent(ctx->dev->dev,
> + cedrus_buf->extra_buf_size,
> + cedrus_buf->extra_buf,
> + cedrus_buf->extra_buf_dma);
> + }
> +}
> +
I'm really not a fan of allocating something somewhere, and freeing it
somewhere else. Making sure you don't leak something is hard enough to
not have some non-trivial allocation scheme.
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Attachment:
signature.asc
Description: PGP signature
