git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e5a9fae31ab7b7bbba5d33573e65a136a5bf83fa..9b476368aa313efd7c33945aeadd2b4c481c70d2 100644
(file)
--- a/
drivers/gpu/drm/etnaviv/etnaviv_sched.c
+++ b/
drivers/gpu/drm/etnaviv/etnaviv_sched.c
@@
-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;
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;
}
sched_job->sched->timeout);
return;
}