| Message ID | 20180927103056.2159-1-nayan26deshmukh@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/v3d: fix build error due to change in scheduler struct | expand |
Am 27.09.2018 um 12:30 schrieb Nayan Deshmukh: > The work_tdr field was moved from drm_sched_job to drm_gpu_scheduler > as part of a previous patch. > > Fixes: 4f07d88d8534 drm/scheduler: remove timeout work_struct from > drm_sched_job > > Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com> I've squashed the two fixed together and pushed the result. With a bit of luck Alex will squash them into the original patch before pushing it upstream. Christian. > --- > drivers/gpu/drm/v3d/v3d_sched.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c > index a5501581d96b..9243dea6e6ad 100644 > --- a/drivers/gpu/drm/v3d/v3d_sched.c > +++ b/drivers/gpu/drm/v3d/v3d_sched.c > @@ -168,7 +168,7 @@ v3d_job_timedout(struct drm_sched_job *sched_job) > job->timedout_ctca = ctca; > job->timedout_ctra = ctra; > > - schedule_delayed_work(&job->base.work_tdr, > + schedule_delayed_work(&job->base.sched->work_tdr, > job->base.sched->timeout); > return; > }
diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c index a5501581d96b..9243dea6e6ad 100644 --- a/drivers/gpu/drm/v3d/v3d_sched.c +++ b/drivers/gpu/drm/v3d/v3d_sched.c @@ -168,7 +168,7 @@ v3d_job_timedout(struct drm_sched_job *sched_job) job->timedout_ctca = ctca; job->timedout_ctra = ctra; - schedule_delayed_work(&job->base.work_tdr, + schedule_delayed_work(&job->base.sched->work_tdr, job->base.sched->timeout); return; }
The work_tdr field was moved from drm_sched_job to drm_gpu_scheduler as part of a previous patch. Fixes: 4f07d88d8534 drm/scheduler: remove timeout work_struct from drm_sched_job Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com> --- drivers/gpu/drm/v3d/v3d_sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)