Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d99de699 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes 



Single etnaviv fence fix for GPU recovery.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1541522424.2508.26.camel@pengutronix.de
parents 65102238 6fce3a40

drivers/gpu/drm/etnaviv/etnaviv_sched.c

+1 −1
Original line number Diff line number Diff line
@@ -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;



	/*