Commit 774f1c91 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: s5p-g2d: Remove unrequired wait in .job_abort 



As per the documentation, job_abort is not required
to wait until the current job finishes. It is redundant
to do so, as the core will perform the wait operation.

Remove the wait infrastructure completely.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 7a0167fb

drivers/media/platform/s5p-g2d/g2d.c

+0 −11
Original line number Diff line number Diff line
@@ -485,15 +485,6 @@ static int vidioc_s_crop(struct file *file, void *prv, const struct v4l2_crop *c 


static void job_abort(void *prv)

{

	struct g2d_ctx *ctx = prv;

	struct g2d_dev *dev = ctx->dev;



	if (dev->curr == NULL) /* No job currently running */

		return;



	wait_event_timeout(dev->irq_queue,

			   dev->curr == NULL,

			   msecs_to_jiffies(G2D_TIMEOUT));

}



static void device_run(void *prv)
@@ -565,7 +556,6 @@ static irqreturn_t g2d_isr(int irq, void *prv) 
	v4l2_m2m_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx);



	dev->curr = NULL;

	wake_up(&dev->irq_queue);

	return IRQ_HANDLED;

}
@@ -635,7 +625,6 @@ static int g2d_probe(struct platform_device *pdev) 
	spin_lock_init(&dev->ctrl_lock);

	mutex_init(&dev->mutex);

	atomic_set(&dev->num_inst, 0);

	init_waitqueue_head(&dev->irq_queue);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

drivers/media/platform/s5p-g2d/g2d.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct g2d_dev { 
	struct g2d_ctx		*curr;

	struct g2d_variant	*variant;

	int irq;

	wait_queue_head_t	irq_queue;

};



struct g2d_frame {

CRA Git | Maintained and supported by SUSTech CRA and CCSE