diff options
| author | Lucas Stach | 2018-10-04 11:37:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-21 09:19:25 +0100 |
| commit | 3ff21b59ffd294c04fd83994e71417247f0d2ee7 (patch) | |
| tree | 3fcda35a915700048856c78311651eb9498aa94b /drivers/gpu/drm/etnaviv | |
| parent | drm/amd/powerplay: Enable/Disable NBPSTATE on On/OFF of UVD (diff) | |
| download | kernel-qcow2-linux-3ff21b59ffd294c04fd83994e71417247f0d2ee7.tar.gz kernel-qcow2-linux-3ff21b59ffd294c04fd83994e71417247f0d2ee7.tar.xz kernel-qcow2-linux-3ff21b59ffd294c04fd83994e71417247f0d2ee7.zip | |
drm/etnaviv: fix bogus fence complete check in timeout handler
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>
Diffstat (limited to 'drivers/gpu/drm/etnaviv')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c index 69e9b431bf1f..e5a9fae31ab7 100644 --- 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(struct drm_sched_job *sched_job) * 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; /* |