[media] coda: allow userspace to set compressed buffer size in a certain range

For small frame sizes, allocating 1 MiB per compressed buffer is a waste of
space. On the other hand, incompressible 1080p data can produce JPEGs larger
than 1 MiB at higher quality settings. Allow userspace to set the compressed
buffer size and clamp the value to a sensible range.
Also set the initial sizeimage to a value inside the range allowed by try_fmt.
While at it, reduce the default image size to a maximum of 1920*1088 (otherwise
JPEG will default to 8k*8k and 96 MiB buffers).

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 2a6810e47a5c42b614b161fc307336384dbb85f5..0c67cfd23c1604fa5b7411ed89aa205c8e31c8ba 100644 (file)
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -1129,7 +1129,7 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
                        ctx->vpu_header_size[0] +
                        ctx->vpu_header_size[1] +
                        ctx->vpu_header_size[2];
-               pic_stream_buffer_size = CODA_MAX_FRAME_SIZE -
+               pic_stream_buffer_size = q_data_dst->sizeimage -
                        ctx->vpu_header_size[0] -
                        ctx->vpu_header_size[1] -
                        ctx->vpu_header_size[2];
@@ -1143,7 +1143,7 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
        } else {
                pic_stream_buffer_addr =
                        vb2_dma_contig_plane_dma_addr(dst_buf, 0);
-               pic_stream_buffer_size = CODA_MAX_FRAME_SIZE;
+               pic_stream_buffer_size = q_data_dst->sizeimage;
        }
 
        if (src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) {

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 6eaf88e88862f955558fbb04d7d593acf9aa044a..151e45b62547aece049dc8e23cf6c139b6bc9ff3 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -513,7 +513,15 @@ static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec,
        case V4L2_PIX_FMT_H264:
        case V4L2_PIX_FMT_MPEG4:
                f->fmt.pix.bytesperline = 0;
-               f->fmt.pix.sizeimage = CODA_MAX_FRAME_SIZE;
+               /*
+                * This is a rough estimate for sensible compressed buffer
+                * sizes (between 1 and 16 bits per pixel). This could be
+                * improved by better format specific worst case estimates.
+                */
+               f->fmt.pix.sizeimage = round_up(clamp(f->fmt.pix.sizeimage,
+                               f->fmt.pix.width * f->fmt.pix.height / 8,
+                               f->fmt.pix.width * f->fmt.pix.height * 2),
+                               PAGE_SIZE);
                break;
        default:
                BUG();
@@ -1015,12 +1023,13 @@ static void coda_set_tiled_map_type(struct coda_ctx *ctx, int tiled_map_type)
 
 static void set_default_params(struct coda_ctx *ctx)
 {
-       int max_w, max_h;
+       unsigned int max_w, max_h, size;
 
        ctx->codec = coda_find_codec(ctx->dev, ctx->cvd->src_formats[0],
                                     ctx->cvd->dst_formats[0]);
-       max_w = ctx->codec->max_w;
-       max_h = ctx->codec->max_h;
+       max_w = min(ctx->codec->max_w, 1920U);
+       max_h = min(ctx->codec->max_h, 1088U);
+       size = max_w * max_h * 3 / 2;
 
        ctx->params.codec_mode = ctx->codec->mode;
        ctx->colorspace = V4L2_COLORSPACE_REC709;
@@ -1035,14 +1044,14 @@ static void set_default_params(struct coda_ctx *ctx)
        ctx->q_data[V4L2_M2M_DST].height = max_h;
        if (ctx->codec->src_fourcc == V4L2_PIX_FMT_YUV420) {
                ctx->q_data[V4L2_M2M_SRC].bytesperline = max_w;
-               ctx->q_data[V4L2_M2M_SRC].sizeimage = (max_w * max_h * 3) / 2;
+               ctx->q_data[V4L2_M2M_SRC].sizeimage = size;
                ctx->q_data[V4L2_M2M_DST].bytesperline = 0;
-               ctx->q_data[V4L2_M2M_DST].sizeimage = CODA_MAX_FRAME_SIZE;
+               ctx->q_data[V4L2_M2M_DST].sizeimage = round_up(size, PAGE_SIZE);
        } else {
                ctx->q_data[V4L2_M2M_SRC].bytesperline = 0;
-               ctx->q_data[V4L2_M2M_SRC].sizeimage = CODA_MAX_FRAME_SIZE;
+               ctx->q_data[V4L2_M2M_SRC].sizeimage = round_up(size, PAGE_SIZE);
                ctx->q_data[V4L2_M2M_DST].bytesperline = max_w;
-               ctx->q_data[V4L2_M2M_DST].sizeimage = (max_w * max_h * 3) / 2;
+               ctx->q_data[V4L2_M2M_DST].sizeimage = size;
        }
        ctx->q_data[V4L2_M2M_SRC].rect.width = max_w;
        ctx->q_data[V4L2_M2M_SRC].rect.height = max_h;