Commit 920340ae authored Sep 19, 2018 by Steve Longerbeam Committed by Philipp Zabel Nov 05, 2018

gpu: ipu-v3: image-convert: Only wait for abort completion if active run



Only wait for the ctx->aborted completion if there is an active run
in progress, otherwise the wait will just timeout after 10 seconds.
If there is no active run in progress, the done queue just needs to
be emptied.

Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

parent 819bec35

drivers/gpu/ipu-v3/ipu-image-convert.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -1562,9 +1562,14 @@ static void __ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx)
		return;
		}

		if (!active_run) {
		empty_done_q(chan);
		return;
		}

		dev_dbg(priv->ipu->dev,
		"%s: task %u: wait for completion: %d runs, active run %p\n",
		__func__, chan->ic_task, run_count, active_run);
		"%s: task %u: wait for completion: %d runs\n",
		__func__, chan->ic_task, run_count);

		ret = wait_for_completion_timeout(&ctx->aborted,
		msecs_to_jiffies(10000));

Admin message