Commit e8d266d5 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Mauro Carvalho Chehab
Browse files

media: mediatek: vcodec: decoder: Drop max_{width,height} from mtk_vcodec_ctx 



This partially reverts commit b018be06 ("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: b018be06 ("media: mediatek: vcodec: Read max resolution from dec_capability")
Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Tested-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent d7abd054

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c

+0 −9
Original line number Diff line number Diff line
@@ -177,8 +177,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;
@@ -514,13 +512,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) {

drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h

+0 −4
Original line number Diff line number Diff line
@@ -286,8 +286,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 {
@@ -334,8 +332,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;

};