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

[sfrench/cifs-2.6.git] / drivers / gpu / drm / etnaviv / etnaviv_sched.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
index 69e9b431bf1f02ec7c87e5f740f80595ad98dd53..9b476368aa313efd7c33945aeadd2b4c481c70d2 100644 (file)
--- 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;
 
        /*
@@ -105,7 +105,7 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job)
        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;
        }