| From 6fce3a406108ee6c8a61e2a33e52e9198a626ea0 Mon Sep 17 00:00:00 2001 |
| From: Lucas Stach <l.stach@pengutronix.de> |
| Date: Thu, 4 Oct 2018 11:37:00 +0200 |
| Subject: drm/etnaviv: fix bogus fence complete check in timeout handler |
| |
| From: Lucas Stach <l.stach@pengutronix.de> |
| |
| commit 6fce3a406108ee6c8a61e2a33e52e9198a626ea0 upstream. |
| |
| The GPU hardware fences and the job out-fences are on different timelines |
| so it's wrong to compare them. Fix this by only looking at the out-fence. |
| |
| Cc: <stable@vger.kernel.org> |
| Fixes: 2c83a726d6fb (drm/etnaviv: bring back progress check in job |
| timeout handler) |
| Signed-off-by: Lucas Stach <l.stach@pengutronix.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c |
| +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c |
| @@ -93,7 +93,7 @@ static void etnaviv_sched_timedout_job(s |
| * If the GPU managed to complete this jobs fence, the timout is |
| * spurious. Bail out. |
| */ |
| - if (fence_completed(gpu, submit->out_fence->seqno)) |
| + if (dma_fence_is_signaled(submit->out_fence)) |
| return; |
| |
| /* |
