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

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

[media] coda: replace completion with mutex 



Not only do we need to wait for job completion when we want to
call a command on the CODA in start/stop_streaming, we also need
to make sure that a new job doesn't start before the command
finished.
Use a mutex to lock the coda command handling. On timeout, the
device_run job must be marked as finished and the mutex released,
as otherwise coda_release will block.

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 <mchehab@redhat.com>
parent d35167a1

drivers/media/platform/coda.c

+35 −31
Original line number Diff line number Diff line
@@ -137,12 +137,12 @@ struct coda_dev { 


	spinlock_t		irqlock;

	struct mutex		dev_mutex;

	struct mutex		coda_mutex;

	struct v4l2_m2m_dev	*m2m_dev;

	struct vb2_alloc_ctx	*alloc_ctx;

	struct list_head	instances;

	unsigned long		instance_mask;

	struct delayed_work	timeout;

	struct completion	done;

};



struct coda_params {
@@ -672,6 +672,8 @@ static void coda_device_run(void *m2m_priv) 
	u32 pic_stream_buffer_addr, pic_stream_buffer_size;

	u32 dst_fourcc;



	mutex_lock(&dev->coda_mutex);



	src_buf = v4l2_m2m_next_src_buf(ctx->m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);

	q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
@@ -792,7 +794,6 @@ static void coda_device_run(void *m2m_priv) 
	/* 1 second timeout in case CODA locks up */

	schedule_delayed_work(&dev->timeout, HZ);



	INIT_COMPLETION(dev->done);

	coda_command_async(ctx, CODA_COMMAND_PIC_RUN);

}
@@ -1072,10 +1073,6 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
			ctx->inst_type = CODA_INST_DECODER;

	}



	if (coda_isbusy(dev))

		if (wait_for_completion_interruptible_timeout(&dev->done, HZ) <= 0)

			return -EBUSY;



	/* Don't start the coda unless both queues are on */

	if (!(ctx->streamon_out & ctx->streamon_cap))

		return 0;
@@ -1098,6 +1095,9 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
		v4l2_err(v4l2_dev, "coda is not initialized.\n");

		return -EFAULT;

	}



	mutex_lock(&dev->coda_mutex);



	coda_write(dev, ctx->parabuf.paddr, CODA_REG_BIT_PARA_BUF_ADDR);

	coda_write(dev, bitstream_buf, CODA_REG_BIT_RD_PTR(ctx->idx));

	coda_write(dev, bitstream_buf, CODA_REG_BIT_WR_PTR(ctx->idx));
@@ -1143,7 +1143,8 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
	default:

		v4l2_err(v4l2_dev,

			 "dst format (0x%08x) invalid.\n", dst_fourcc);

		return -EINVAL;

		ret = -EINVAL;

		goto out;

	}



	switch (ctx->params.slice_mode) {
@@ -1206,17 +1207,23 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
		}

	}



	if (coda_command_sync(ctx, CODA_COMMAND_SEQ_INIT)) {

	ret = coda_command_sync(ctx, CODA_COMMAND_SEQ_INIT);

	if (ret < 0) {

		v4l2_err(v4l2_dev, "CODA_COMMAND_SEQ_INIT timeout\n");

		return -ETIMEDOUT;

		goto out;

	}



	if (coda_read(dev, CODA_RET_ENC_SEQ_SUCCESS) == 0)

		return -EFAULT;

	if (coda_read(dev, CODA_RET_ENC_SEQ_SUCCESS) == 0) {

		v4l2_err(v4l2_dev, "CODA_COMMAND_SEQ_INIT failed\n");

		ret = -EFAULT;

		goto out;

	}



	ret = coda_alloc_framebuffers(ctx, q_data_src, dst_fourcc);

	if (ret < 0)

		return ret;

	if (ret < 0) {

		v4l2_err(v4l2_dev, "failed to allocate framebuffers\n");

		goto out;

	}



	coda_write(dev, ctx->num_internal_frames, CODA_CMD_SET_FRAME_BUF_NUM);

	coda_write(dev, round_up(q_data_src->width, 8), CODA_CMD_SET_FRAME_BUF_STRIDE);
@@ -1228,9 +1235,10 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
		coda_write(dev, dev->iram_paddr + 68 * 1024, CODA7_CMD_SET_FRAME_AXI_IPACDC_ADDR);

		coda_write(dev, 0x0, CODA7_CMD_SET_FRAME_AXI_OVL_ADDR);

	}

	if (coda_command_sync(ctx, CODA_COMMAND_SET_FRAME_BUF)) {

	ret = coda_command_sync(ctx, CODA_COMMAND_SET_FRAME_BUF);

	if (ret < 0) {

		v4l2_err(v4l2_dev, "CODA_COMMAND_SET_FRAME_BUF timeout\n");

		return -ETIMEDOUT;

		goto out;

	}



	/* Save stream headers */
@@ -1296,6 +1304,7 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
	}



out:

	mutex_unlock(&dev->coda_mutex);

	return ret;

}
@@ -1318,15 +1327,9 @@ static int coda_stop_streaming(struct vb2_queue *q) 
	if (ctx->streamon_out || ctx->streamon_cap)

		return 0;



	if (coda_isbusy(dev)) {

		if (wait_for_completion_interruptible_timeout(&dev->done, HZ) <= 0) {

			v4l2_warn(&dev->v4l2_dev,

				  "%s: timeout, sending SEQ_END anyway\n", __func__);

		}

	}



	cancel_delayed_work(&dev->timeout);



	mutex_lock(&dev->coda_mutex);

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

		 "%s: sent command 'SEQ_END' to coda\n", __func__);

	if (coda_command_sync(ctx, CODA_COMMAND_SEQ_END)) {
@@ -1334,6 +1337,7 @@ static int coda_stop_streaming(struct vb2_queue *q) 
			 "CODA_COMMAND_SEQ_END failed\n");

		return -ETIMEDOUT;

	}

	mutex_unlock(&dev->coda_mutex);



	coda_free_framebuffers(ctx);
@@ -1629,12 +1633,14 @@ static irqreturn_t coda_irq_handler(int irq, void *data) 
	ctx = v4l2_m2m_get_curr_priv(dev->m2m_dev);

	if (ctx == NULL) {

		v4l2_err(&dev->v4l2_dev, "Instance released before the end of transaction\n");

		mutex_unlock(&dev->coda_mutex);

		return IRQ_HANDLED;

	}



	if (ctx->aborting) {

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

			 "task has been aborted\n");

		mutex_unlock(&dev->coda_mutex);

		return IRQ_HANDLED;

	}
@@ -1644,8 +1650,6 @@ static irqreturn_t coda_irq_handler(int irq, void *data) 
		return IRQ_NONE;

	}



	complete(&dev->done);



	src_buf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);

	dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
@@ -1693,6 +1697,8 @@ static irqreturn_t coda_irq_handler(int irq, void *data) 
		(dst_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) ?

		"KEYFRAME" : "PFRAME");



	mutex_unlock(&dev->coda_mutex);



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



	return IRQ_HANDLED;
@@ -1704,11 +1710,6 @@ static void coda_timeout(struct work_struct *work) 
	struct coda_dev *dev = container_of(to_delayed_work(work),

					    struct coda_dev, timeout);



	if (completion_done(&dev->done))

		return;



	complete(&dev->done);



	dev_err(&dev->plat_dev->dev, "CODA PIC_RUN timeout, stopping all streams\n");



	mutex_lock(&dev->dev_mutex);
@@ -1717,6 +1718,10 @@ static void coda_timeout(struct work_struct *work) 
		v4l2_m2m_streamoff(NULL, ctx->m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);

	}

	mutex_unlock(&dev->dev_mutex);



	mutex_unlock(&dev->coda_mutex);

	ctx = v4l2_m2m_get_curr_priv(dev->m2m_dev);

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

}



static u32 coda_supported_firmwares[] = {
@@ -1999,8 +2004,6 @@ static int coda_probe(struct platform_device *pdev) 
	spin_lock_init(&dev->irqlock);

	INIT_LIST_HEAD(&dev->instances);

	INIT_DELAYED_WORK(&dev->timeout, coda_timeout);

	init_completion(&dev->done);

	complete(&dev->done);



	dev->plat_dev = pdev;

	dev->clk_per = devm_clk_get(&pdev->dev, "per");
@@ -2054,6 +2057,7 @@ static int coda_probe(struct platform_device *pdev) 
		return ret;



	mutex_init(&dev->dev_mutex);

	mutex_init(&dev->coda_mutex);



	pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);