media: mediatek: vcodec: Read max resolution from dec_capability

Supported max resolution for different platforms are not the same: 2K
or 4K, getting it according to dec_capability.

Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: Tzung-Bi Shih<tzungbi@google.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
index c8ee5e2b4f6990d40dc7e07eccbf878aca1514cf..6bb02cee147d97162c26c056af30c13031d36959 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
@@ -141,13 +141,15 @@ void mtk_vcodec_dec_set_default_params(struct mtk_vcodec_ctx *ctx)
        q_data->coded_height = DFT_CFG_HEIGHT;
        q_data->fmt = ctx->dev->vdec_pdata->default_cap_fmt;
        q_data->field = V4L2_FIELD_NONE;
+       ctx->max_width = MTK_VDEC_MAX_W;
+       ctx->max_height = MTK_VDEC_MAX_H;
 
        v4l_bound_align_image(&q_data->coded_width,
                                MTK_VDEC_MIN_W,
-                               MTK_VDEC_MAX_W, 4,
+                               ctx->max_width, 4,
                                &q_data->coded_height,
                                MTK_VDEC_MIN_H,
-                               MTK_VDEC_MAX_H, 5, 6);
+                               ctx->max_height, 5, 6);
 
        q_data->sizeimage[0] = q_data->coded_width * q_data->coded_height;
        q_data->bytesperline[0] = q_data->coded_width;
@@ -206,7 +208,7 @@ static int vidioc_vdec_subscribe_evt(struct v4l2_fh *fh,
        }
 }
 
-static int vidioc_try_fmt(struct v4l2_format *f,
+static int vidioc_try_fmt(struct mtk_vcodec_ctx *ctx, struct v4l2_format *f,
                          const struct mtk_video_fmt *fmt)
 {
        struct v4l2_pix_format_mplane *pix_fmt_mp = &f->fmt.pix_mp;
@@ -214,9 +216,9 @@ static int vidioc_try_fmt(struct v4l2_format *f,
        pix_fmt_mp->field = V4L2_FIELD_NONE;
 
        pix_fmt_mp->width =
-               clamp(pix_fmt_mp->width, MTK_VDEC_MIN_W, MTK_VDEC_MAX_W);
+               clamp(pix_fmt_mp->width, MTK_VDEC_MIN_W, ctx->max_width);
        pix_fmt_mp->height =
-               clamp(pix_fmt_mp->height, MTK_VDEC_MIN_H, MTK_VDEC_MAX_H);
+               clamp(pix_fmt_mp->height, MTK_VDEC_MIN_H, ctx->max_height);
 
        if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
                pix_fmt_mp->num_planes = 1;
@@ -234,16 +236,16 @@ static int vidioc_try_fmt(struct v4l2_format *f,
                tmp_h = pix_fmt_mp->height;
                v4l_bound_align_image(&pix_fmt_mp->width,
                                        MTK_VDEC_MIN_W,
-                                       MTK_VDEC_MAX_W, 6,
+                                       ctx->max_width, 6,
                                        &pix_fmt_mp->height,
                                        MTK_VDEC_MIN_H,
-                                       MTK_VDEC_MAX_H, 6, 9);
+                                       ctx->max_height, 6, 9);
 
                if (pix_fmt_mp->width < tmp_w &&
-                       (pix_fmt_mp->width + 64) <= MTK_VDEC_MAX_W)
+                       (pix_fmt_mp->width + 64) <= ctx->max_width)
                        pix_fmt_mp->width += 64;
                if (pix_fmt_mp->height < tmp_h &&
-                       (pix_fmt_mp->height + 64) <= MTK_VDEC_MAX_H)
+                       (pix_fmt_mp->height + 64) <= ctx->max_height)
                        pix_fmt_mp->height += 64;
 
                mtk_v4l2_debug(0,
@@ -283,7 +285,7 @@ static int vidioc_try_fmt_vid_cap_mplane(struct file *file, void *priv,
                fmt = mtk_vdec_find_format(f, dec_pdata);
        }
 
-       return vidioc_try_fmt(f, fmt);
+       return vidioc_try_fmt(ctx, f, fmt);
 }
 
 static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv,
@@ -306,7 +308,7 @@ static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv,
                return -EINVAL;
        }
 
-       return vidioc_try_fmt(f, fmt);
+       return vidioc_try_fmt(ctx, f, fmt);
 }
 
 static int vidioc_vdec_g_selection(struct file *file, void *priv,
@@ -433,8 +435,14 @@ static int vidioc_vdec_s_fmt(struct file *file, void *priv,
        if (fmt == NULL)
                return -EINVAL;
 
+       if (!(ctx->dev->dec_capability & VCODEC_CAPABILITY_4K_DISABLED)) {
+               mtk_v4l2_debug(3, "4K is enabled");
+               ctx->max_width = VCODEC_DEC_4K_CODED_WIDTH;
+               ctx->max_height = VCODEC_DEC_4K_CODED_HEIGHT;
+       }
+
        q_data->fmt = fmt;
-       vidioc_try_fmt(f, q_data->fmt);
+       vidioc_try_fmt(ctx, f, q_data->fmt);
        if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
                q_data->sizeimage[0] = pix_mp->plane_fmt[0].sizeimage;
                q_data->coded_width = pix_mp->width;
@@ -518,14 +526,9 @@ static int vidioc_enum_framesizes(struct file *file, void *priv,
 
                fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
                fsize->stepwise = dec_pdata->vdec_framesizes[i].stepwise;
-               if (!(ctx->dev->dec_capability &
-                               VCODEC_CAPABILITY_4K_DISABLED)) {
-                       mtk_v4l2_debug(3, "4K is enabled");
-                       fsize->stepwise.max_width =
-                                       VCODEC_DEC_4K_CODED_WIDTH;
-                       fsize->stepwise.max_height =
-                                       VCODEC_DEC_4K_CODED_HEIGHT;
-               }
+
+               fsize->stepwise.max_width = ctx->max_width;
+               fsize->stepwise.max_height = ctx->max_height;
                mtk_v4l2_debug(1, "%x, %d %d %d %d %d %d",
                                ctx->dev->dec_capability,
                                fsize->stepwise.min_width,
@@ -534,6 +537,7 @@ static int vidioc_enum_framesizes(struct file *file, void *priv,
                                fsize->stepwise.min_height,
                                fsize->stepwise.max_height,
                                fsize->stepwise.step_height);
+
                return 0;
        }
 

diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
index bb7b8e914d24af436d3d7b66559ac1051c4bd367..6d27e4d41edea90886eb7679a6f1899542f6564b 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
@@ -284,6 +284,8 @@ struct vdec_pic_info {
  *       mtk_video_dec_buf.
  * @hw_id: hardware index used to identify different hardware.
  *
+ * @max_width: hardware supported max width
+ * @max_height: hardware supported max height
  * @msg_queue: msg queue used to store lat buffer information.
  */
 struct mtk_vcodec_ctx {
@@ -329,6 +331,8 @@ struct mtk_vcodec_ctx {
        struct mutex lock;
        int hw_id;
 
+       unsigned int max_width;
+       unsigned int max_height;
        struct vdec_msg_queue msg_queue;
 };