lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0461/1157] media: mediatek: vcodec: decoder: Drop max_{width,height} from mtk_vcodec_ctx
    Date
    From: Chen-Yu Tsai <wenst@chromium.org>

    [ Upstream commit e8d266d533b171387945f8a0bad1944a5609f63b ]

    This partially reverts commit b018be06f3c7 ("media: mediatek: vcodec:
    Read max resolution from dec_capability").

    After the previous patches:

    - media: mediatek: vcodec: decoder: Fix 4K frame size enumeration
    - media: mediatek: vcodec: decoder: Skip alignment for default resolution
    - media: mediatek: vcodec: decoder: Fix resolution clamping in TRY_FMT

    the max_{width,height} fields in |struct mtk_vcodec_ctx| no longer have
    any real users. Remove them.

    Fixes: b018be06f3c7 ("media: mediatek: vcodec: Read max resolution from dec_capability")
    Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
    Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 9 ---------
    drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h | 4 ----
    2 files changed, 13 deletions(-)

    diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
    index 7d654efabdfe..af3cd2e36451 100644
    --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
    +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
    @@ -139,8 +139,6 @@ 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;

    q_data->sizeimage[0] = q_data->coded_width * q_data->coded_height;
    q_data->bytesperline[0] = q_data->coded_width;
    @@ -455,13 +453,6 @@ 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) &&
    - fmt->fourcc != V4L2_PIX_FMT_VP8_FRAME) {
    - 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(ctx, f, q_data->fmt);
    if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
    diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
    index a29041a0b7e0..16e91d9568e9 100644
    --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
    +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
    @@ -285,8 +285,6 @@ 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 {
    @@ -333,8 +331,6 @@ struct mtk_vcodec_ctx {
    struct mutex lock;
    int hw_id;

    - unsigned int max_width;
    - unsigned int max_height;
    struct vdec_msg_queue msg_queue;
    };

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 01:55    [W:2.205 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site