Commit 9ccd0021 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: ti-vpe: cal: Drop cal_ctx m_fmt field 



The struct cal_ctx m_fmt field stores the media bus format for the
context input. Only the format 'field' field is used, store it in the
video format instead, and drop m_fmt.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 5acc3e22

drivers/media/platform/ti-vpe/cal-video.c

+5 −5
Original line number Diff line number Diff line
@@ -388,9 +388,9 @@ static int cal_s_fmt_vid_cap(struct file *file, void *priv, 
	v4l2_fill_pix_format(&ctx->v_fmt.fmt.pix, &mbus_fmt);

	ctx->v_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

	ctx->v_fmt.fmt.pix.pixelformat = fmt->fourcc;

	ctx->v_fmt.fmt.pix.field = mbus_fmt.field;

	cal_calc_format_size(ctx, fmt, &ctx->v_fmt);

	ctx->fmt = fmt;

	ctx->m_fmt = mbus_fmt;

	*f = ctx->v_fmt;



	return 0;
@@ -775,13 +775,13 @@ static int cal_ctx_v4l2_init_formats(struct cal_ctx *ctx) 
		return -EINVAL;

	}



	/* Save current subdev format */

	/* Save current format */

	v4l2_fill_pix_format(&ctx->v_fmt.fmt.pix, &mbus_fmt);

	ctx->v_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

	ctx->v_fmt.fmt.pix.pixelformat = fmt->fourcc;

	ctx->v_fmt.fmt.pix.field = mbus_fmt.field;

	cal_calc_format_size(ctx, fmt, &ctx->v_fmt);

	ctx->fmt = fmt;

	ctx->m_fmt = mbus_fmt;



	return 0;

}

drivers/media/platform/ti-vpe/cal.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static inline void cal_schedule_next_buffer(struct cal_ctx *ctx) 
static inline void cal_process_buffer_complete(struct cal_ctx *ctx)

{

	ctx->cur_frm->vb.vb2_buf.timestamp = ktime_get_ns();

	ctx->cur_frm->vb.field = ctx->m_fmt.field;

	ctx->cur_frm->vb.field = ctx->v_fmt.fmt.pix.field;

	ctx->cur_frm->vb.sequence = ctx->sequence++;



	vb2_buffer_done(&ctx->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);

drivers/media/platform/ti-vpe/cal.h

+1 −3
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ struct cal_ctx { 
	const struct cal_fmt	*fmt;

	/* Used to store current pixel format */

	struct v4l2_format	v_fmt;

	/* Used to store current mbus frame format */

	struct v4l2_mbus_framefmt	m_fmt;



	/* Current subdev enumerated format */

	const struct cal_fmt	**active_fmt;