Skip to content

Commit

Permalink
Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux
Browse files Browse the repository at this point in the history
 into drm-fixes

Single etnaviv fence fix for GPU recovery.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1541522424.2508.26.camel@pengutronix.de
  • Loading branch information
Dave Airlie committed Nov 6, 2018
2 parents 6510223 + 6fce3a4 commit d99de69
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/etnaviv/etnaviv_sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down

0 comments on commit d99de69

Please sign in to comment.