| Message ID | 20180618043852.13293-2-ezequiel@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Acked-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com> On Mon, Jun 18, 2018 at 7:38 AM, Ezequiel Garcia <ezequiel@collabora.com> wrote: > 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. > > Cc: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com> > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > --- > drivers/media/platform/rcar_jpu.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c > index 469a326838aa..dec696e6b974 100644 > --- a/drivers/media/platform/rcar_jpu.c > +++ b/drivers/media/platform/rcar_jpu.c > @@ -198,7 +198,6 @@ > * @vfd_decoder: video device node for decoder mem2mem mode > * @m2m_dev: v4l2 mem2mem device data > * @curr: pointer to current context > - * @irq_queue: interrupt handler waitqueue > * @regs: JPEG IP registers mapping > * @irq: JPEG IP irq > * @clk: JPEG IP clock > @@ -213,7 +212,6 @@ struct jpu { > struct video_device vfd_decoder; > struct v4l2_m2m_dev *m2m_dev; > struct jpu_ctx *curr; > - wait_queue_head_t irq_queue; > > void __iomem *regs; > unsigned int irq; > @@ -1494,11 +1492,6 @@ static void jpu_device_run(void *priv) > > static void jpu_job_abort(void *priv) > { > - struct jpu_ctx *ctx = priv; > - > - if (!wait_event_timeout(ctx->jpu->irq_queue, !ctx->jpu->curr, > - msecs_to_jiffies(JPU_JOB_TIMEOUT))) > - jpu_cleanup(ctx, true); > } > > static const struct v4l2_m2m_ops jpu_m2m_ops = { > @@ -1584,9 +1577,6 @@ static irqreturn_t jpu_irq_handler(int irq, void *dev_id) > > v4l2_m2m_job_finish(jpu->m2m_dev, curr_ctx->fh.m2m_ctx); > > - /* ...wakeup abort routine if needed */ > - wake_up(&jpu->irq_queue); > - > return IRQ_HANDLED; > > handled: > @@ -1620,7 +1610,6 @@ static int jpu_probe(struct platform_device *pdev) > if (!jpu) > return -ENOMEM; > > - init_waitqueue_head(&jpu->irq_queue); > mutex_init(&jpu->mutex); > spin_lock_init(&jpu->lock); > jpu->dev = &pdev->dev; > -- > 2.16.3 >
diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c index 469a326838aa..dec696e6b974 100644 --- a/drivers/media/platform/rcar_jpu.c +++ b/drivers/media/platform/rcar_jpu.c @@ -198,7 +198,6 @@ * @vfd_decoder: video device node for decoder mem2mem mode * @m2m_dev: v4l2 mem2mem device data * @curr: pointer to current context - * @irq_queue: interrupt handler waitqueue * @regs: JPEG IP registers mapping * @irq: JPEG IP irq * @clk: JPEG IP clock @@ -213,7 +212,6 @@ struct jpu { struct video_device vfd_decoder; struct v4l2_m2m_dev *m2m_dev; struct jpu_ctx *curr; - wait_queue_head_t irq_queue; void __iomem *regs; unsigned int irq; @@ -1494,11 +1492,6 @@ static void jpu_device_run(void *priv) static void jpu_job_abort(void *priv) { - struct jpu_ctx *ctx = priv; - - if (!wait_event_timeout(ctx->jpu->irq_queue, !ctx->jpu->curr, - msecs_to_jiffies(JPU_JOB_TIMEOUT))) - jpu_cleanup(ctx, true); } static const struct v4l2_m2m_ops jpu_m2m_ops = { @@ -1584,9 +1577,6 @@ static irqreturn_t jpu_irq_handler(int irq, void *dev_id) v4l2_m2m_job_finish(jpu->m2m_dev, curr_ctx->fh.m2m_ctx); - /* ...wakeup abort routine if needed */ - wake_up(&jpu->irq_queue); - return IRQ_HANDLED; handled: @@ -1620,7 +1610,6 @@ static int jpu_probe(struct platform_device *pdev) if (!jpu) return -ENOMEM; - init_waitqueue_head(&jpu->irq_queue); mutex_init(&jpu->mutex); spin_lock_init(&jpu->lock); jpu->dev = &pdev->dev;
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. Cc: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> --- drivers/media/platform/rcar_jpu.c | 11 ----------- 1 file changed, 11 deletions(-)