1 files changed, 23 insertions, 15 deletions

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 490b933ad616..15f4c2b91e42 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -468,6 +468,18 @@ static int coda_try_pixelformat(struct coda_ctx *ctx, struct v4l2_format *f)
         return 0;
 }
 
+static unsigned int coda_estimate_sizeimage(struct coda_ctx *ctx, u32 sizeimage,
+                                            u32 width, u32 height)
+{
+        /*
+         * 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.
+         */
+        return round_up(clamp(sizeimage, width * height / 8,
+                                         width * height * 2), PAGE_SIZE);
+}
+
 static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec,
                         struct v4l2_format *f)
 {
@@ -513,15 +525,10 @@ 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;
-                /*
-                 * 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);
+                f->fmt.pix.sizeimage = coda_estimate_sizeimage(ctx,
+                                                        f->fmt.pix.sizeimage,
+                                                        f->fmt.pix.width,
+                                                        f->fmt.pix.height);
                 break;
         default:
                 BUG();
@@ -1056,13 +1063,14 @@ static void coda_set_tiled_map_type(struct coda_ctx *ctx, int tiled_map_type)
 
 static void set_default_params(struct coda_ctx *ctx)
 {
-        unsigned int max_w, max_h, size;
+        unsigned int max_w, max_h, usize, csize;
 
         ctx->codec = coda_find_codec(ctx->dev, ctx->cvd->src_formats[0],
                                      ctx->cvd->dst_formats[0]);
         max_w = min(ctx->codec->max_w, 1920U);
         max_h = min(ctx->codec->max_h, 1088U);
-        size = max_w * max_h * 3 / 2;
+        usize = max_w * max_h * 3 / 2;
+        csize = coda_estimate_sizeimage(ctx, usize, max_w, max_h);
 
         ctx->params.codec_mode = ctx->codec->mode;
         ctx->colorspace = V4L2_COLORSPACE_REC709;
@@ -1077,14 +1085,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 = size;
+                ctx->q_data[V4L2_M2M_SRC].sizeimage = usize;
                 ctx->q_data[V4L2_M2M_DST].bytesperline = 0;
-                ctx->q_data[V4L2_M2M_DST].sizeimage = round_up(size, PAGE_SIZE);
+                ctx->q_data[V4L2_M2M_DST].sizeimage = csize;
         } else {
                 ctx->q_data[V4L2_M2M_SRC].bytesperline = 0;
-                ctx->q_data[V4L2_M2M_SRC].sizeimage = round_up(size, PAGE_SIZE);
+                ctx->q_data[V4L2_M2M_SRC].sizeimage = csize;
                 ctx->q_data[V4L2_M2M_DST].bytesperline = max_w;
-                ctx->q_data[V4L2_M2M_DST].sizeimage = size;
+                ctx->q_data[V4L2_M2M_DST].sizeimage = usize;
         }
         ctx->q_data[V4L2_M2M_SRC].rect.width = max_w;
         ctx->q_data[V4L2_M2M_SRC].rect.height = max_h;