diff options
| author |   Steve Longerbeam <slongerbeam@gmail.com> | 2018-09-19 16:13:03 -0700 |
|---|---|---|
| committer |   Philipp Zabel <p.zabel@pengutronix.de> | 2018-11-05 14:40:07 +0100 |
| commit | 920340ae1f6949c3c75f96253bb249efa8b80167 (patch) | |
| tree | a7af78d42ea7183eadc03dc78c7f4022031e0396 /drivers/gpu/ipu-v3 | |
| parent | gpu: ipu-v3: image-convert: Prevent race between run and unprepare (diff) | |
| download | linux-dev-920340ae1f6949c3c75f96253bb249efa8b80167.tar.xz linux-dev-920340ae1f6949c3c75f96253bb249efa8b80167.zip | |
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>
Diffstat (limited to 'drivers/gpu/ipu-v3')
| -rw-r--r-- | drivers/gpu/ipu-v3/ipu-image-convert.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c index 6c15bf8efaa2..e3e032252604 100644 --- a/drivers/gpu/ipu-v3/ipu-image-convert.c +++ b/drivers/gpu/ipu-v3/ipu-image-convert.c @@ -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)); |