Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14604e3a authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: use ctx->fh.m2m_ctx instead of ctx->m2m_ctx 



v4l2_fh already contains a mem2mem context pointer. Use it.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 152ea1c8

drivers/media/platform/coda.c

+32 −34
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ struct coda_ctx { 
	struct coda_codec		*codec;

	enum v4l2_colorspace		colorspace;

	struct coda_params		params;

	struct v4l2_m2m_ctx		*m2m_ctx;

	struct v4l2_ctrl_handler	ctrls;

	struct v4l2_fh			fh;

	int				gopcounter;
@@ -553,7 +552,7 @@ static int coda_enum_fmt_vid_cap(struct file *file, void *priv, 
	struct coda_q_data *q_data_src;



	/* If the source format is already fixed, only list matching formats */

	src_vq = v4l2_m2m_get_vq(ctx->m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);

	src_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);

	if (vb2_is_streaming(src_vq)) {

		q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
@@ -665,7 +664,7 @@ static int coda_try_fmt_vid_cap(struct file *file, void *priv, 
	 * If the source format is already fixed, try to find a codec that

	 * converts to the given destination format

	 */

	src_vq = v4l2_m2m_get_vq(ctx->m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);

	src_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);

	if (vb2_is_streaming(src_vq)) {

		struct coda_q_data *q_data_src;
@@ -719,7 +718,7 @@ static int coda_s_fmt(struct coda_ctx *ctx, struct v4l2_format *f) 
	struct coda_q_data *q_data;

	struct vb2_queue *vq;



	vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type);

	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);

	if (!vq)

		return -EINVAL;
@@ -783,7 +782,7 @@ static int coda_qbuf(struct file *file, void *priv, 
{

	struct coda_ctx *ctx = fh_to_ctx(priv);



	return v4l2_m2m_qbuf(file, ctx->m2m_ctx, buf);

	return v4l2_m2m_qbuf(file, ctx->fh.m2m_ctx, buf);

}



static bool coda_buf_is_end_of_stream(struct coda_ctx *ctx,
@@ -791,7 +790,7 @@ static bool coda_buf_is_end_of_stream(struct coda_ctx *ctx, 
{

	struct vb2_queue *src_vq;



	src_vq = v4l2_m2m_get_vq(ctx->m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);

	src_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);



	return ((ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG) &&

		(buf->sequence == (ctx->qsequence - 1)));
@@ -803,7 +802,7 @@ static int coda_dqbuf(struct file *file, void *priv, 
	struct coda_ctx *ctx = fh_to_ctx(priv);

	int ret;



	ret = v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf);

	ret = v4l2_m2m_dqbuf(file, ctx->fh.m2m_ctx, buf);



	/* If this is the last capture buffer, emit an end-of-stream event */

	if (buf->type == V4L2_BUF_TYPE_VIDEO_CAPTURE &&
@@ -1040,11 +1039,11 @@ static void coda_fill_bitstream(struct coda_ctx *ctx) 
{

	struct vb2_buffer *src_buf;



	while (v4l2_m2m_num_src_bufs_ready(ctx->m2m_ctx) > 0) {

		src_buf = v4l2_m2m_next_src_buf(ctx->m2m_ctx);

	while (v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) > 0) {

		src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);



		if (coda_bitstream_try_queue(ctx, src_buf)) {

			src_buf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);

			src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);

			v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);

		} else {

			break;
@@ -1084,7 +1083,7 @@ static int coda_prepare_decode(struct coda_ctx *ctx) 
	u32 stridey, height;

	u32 picture_y, picture_cb, picture_cr;



	dst_buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);



	if (ctx->params.rot_mode & CODA_ROT_90) {
@@ -1105,7 +1104,7 @@ static int coda_prepare_decode(struct coda_ctx *ctx) 
		v4l2_dbg(1, coda_debug, &dev->v4l2_dev,

			 "bitstream payload: %d, skipping\n",

			 coda_get_bitstream_payload(ctx));

		v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->m2m_ctx);

		v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx);

		return -EAGAIN;

	}
@@ -1114,7 +1113,7 @@ static int coda_prepare_decode(struct coda_ctx *ctx) 
		int ret = coda_start_decoding(ctx);

		if (ret < 0) {

			v4l2_err(&dev->v4l2_dev, "failed to start decoding\n");

			v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->m2m_ctx);

			v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx);

			return -EAGAIN;

		} else {

			ctx->initialized = 1;
@@ -1187,8 +1186,8 @@ static void coda_prepare_encode(struct coda_ctx *ctx) 
	u32 pic_stream_buffer_addr, pic_stream_buffer_size;

	u32 dst_fourcc;



	src_buf = v4l2_m2m_next_src_buf(ctx->m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);

	src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

	q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);

	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);

	dst_fourcc = q_data_dst->fourcc;
@@ -1401,7 +1400,7 @@ static void coda_pic_run_work(struct work_struct *work) 
	mutex_unlock(&dev->coda_mutex);

	mutex_unlock(&ctx->buffer_mutex);



	v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->m2m_ctx);

	v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx);

}



static int coda_job_ready(void *m2m_priv)
@@ -1413,14 +1412,14 @@ static int coda_job_ready(void *m2m_priv) 
	 * and 1 frame are needed. In the decoder case,

	 * the compressed frame can be in the bitstream.

	 */

	if (!v4l2_m2m_num_src_bufs_ready(ctx->m2m_ctx) &&

	if (!v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) &&

	    ctx->inst_type != CODA_INST_DECODER) {

		v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev,

			 "not ready: not enough video buffers.\n");

		return 0;

	}



	if (!v4l2_m2m_num_dst_bufs_ready(ctx->m2m_ctx)) {

	if (!v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx)) {

		v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev,

			 "not ready: not enough video capture buffers.\n");

		return 0;
@@ -1609,11 +1608,11 @@ static void coda_buf_queue(struct vb2_buffer *vb) 
			}

		}

		mutex_lock(&ctx->bitstream_mutex);

		v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);

		v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);

		coda_fill_bitstream(ctx);

		mutex_unlock(&ctx->bitstream_mutex);

	} else {

		v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);

		v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);

	}

}
@@ -2210,7 +2209,7 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 


	/* Allow decoder device_run with no new buffers queued */

	if (ctx->inst_type == CODA_INST_DECODER)

		v4l2_m2m_set_src_buffered(ctx->m2m_ctx, true);

		v4l2_m2m_set_src_buffered(ctx->fh.m2m_ctx, true);



	ctx->gopcounter = ctx->params.gop_size - 1;

	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
@@ -2258,7 +2257,7 @@ static int coda_start_encoding(struct coda_ctx *ctx) 
	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);

	dst_fourcc = q_data_dst->fourcc;



	buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);

	buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

	bitstream_buf = vb2_dma_contig_plane_dma_addr(buf, 0);

	bitstream_size = q_data_dst->sizeimage;
@@ -2469,7 +2468,7 @@ static int coda_start_encoding(struct coda_ctx *ctx) 
	}



	/* Save stream headers */

	buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);

	buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

	switch (dst_fourcc) {

	case V4L2_PIX_FMT_H264:

		/*
@@ -2777,16 +2776,15 @@ static int coda_open(struct file *file) 
		goto err_clk_ahb;



	set_default_params(ctx);

	ctx->m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx,

	ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx,

					 &coda_queue_init);

	if (IS_ERR(ctx->m2m_ctx)) {

		ret = PTR_ERR(ctx->m2m_ctx);

	if (IS_ERR(ctx->fh.m2m_ctx)) {

		ret = PTR_ERR(ctx->fh.m2m_ctx);



		v4l2_err(&dev->v4l2_dev, "%s return error (%d)\n",

			 __func__, ret);

		goto err_ctx_init;

	}

	ctx->fh.m2m_ctx = ctx->m2m_ctx;



	ret = coda_ctrls_setup(ctx);

	if (ret) {
@@ -2832,7 +2830,7 @@ static int coda_open(struct file *file) 
err_dma_alloc:

	v4l2_ctrl_handler_free(&ctx->ctrls);

err_ctrls_setup:

	v4l2_m2m_ctx_release(ctx->m2m_ctx);

	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);

err_ctx_init:

	clk_disable_unprepare(dev->clk_ahb);

err_clk_ahb:
@@ -2855,7 +2853,7 @@ static int coda_release(struct file *file) 
		 ctx);



	/* If this instance is running, call .job_abort and wait for it to end */

	v4l2_m2m_ctx_release(ctx->m2m_ctx);

	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);



	/* In case the instance was not running, we still need to call SEQ_END */

	if (ctx->initialized) {
@@ -2909,7 +2907,7 @@ static void coda_finish_decode(struct coda_ctx *ctx) 
	int success;

	u32 val;



	dst_buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);



	/* Update kfifo out pointer from coda bitstream read pointer */

	coda_kfifo_sync_from_device(ctx);
@@ -3049,7 +3047,7 @@ static void coda_finish_decode(struct coda_ctx *ctx) 
	/* If a frame was copied out, return it */

	if (ctx->display_idx >= 0 &&

	    ctx->display_idx < ctx->num_internal_frames) {

		dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);

		dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);

		dst_buf->v4l2_buf.sequence = ctx->osequence++;



		dst_buf->v4l2_buf.flags &= ~(V4L2_BUF_FLAG_KEYFRAME |
@@ -3082,8 +3080,8 @@ static void coda_finish_encode(struct coda_ctx *ctx) 
	struct coda_dev *dev = ctx->dev;

	u32 wr_ptr, start_ptr;



	src_buf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);

	src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);



	/* Get results from the coda */

	start_ptr = coda_read(dev, CODA_CMD_ENC_PIC_BB_START);
@@ -3121,7 +3119,7 @@ static void coda_finish_encode(struct coda_ctx *ctx) 


	v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);



	dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);

	dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);

	v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);



	ctx->gopcounter--;