Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 6 Nov 2018 23:32:22 +0000 (09:32 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 6 Nov 2018 23:32:30 +0000 (09:32 +1000)
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
1  2 
drivers/gpu/drm/etnaviv/etnaviv_sched.c

index e7c3ed6c9a2e10ddcd7665e851a1bffb9ff0247f,e5a9fae31ab7b7bbba5d33573e65a136a5bf83fa..9b476368aa313efd7c33945aeadd2b4c481c70d2
@@@ -93,7 -93,7 +93,7 @@@ static void etnaviv_sched_timedout_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;
  
        /*
        change = dma_addr - gpu->hangcheck_dma_addr;
        if (change < 0 || change > 16) {
                gpu->hangcheck_dma_addr = dma_addr;
 -              schedule_delayed_work(&sched_job->work_tdr,
 +              schedule_delayed_work(&sched_job->sched->work_tdr,
                                      sched_job->sched->timeout);
                return;
        }