Skip to contentSkip to conversation

drm/v3d: fix build error due to change in scheduler struct

PATCH In review Nayan Deshmukh 2 participants 2 messages Sep 27, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/v3d: fix build error due to change in scheduler struct

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

---
 drivers/gpu/drm/v3d/v3d_sched.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/v3d/v3d_sched.c +1 -1
index a5501581d96b..9243dea6e6ad 100644
@@ -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;
 	}
Signature · 6 lines
2.14.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

Am 27.09.2018 um 12:30 schrieb Nayan Deshmukh:

Quoted 7 lines

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

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.

Quoted 9 lines
---
  drivers/gpu/drm/v3d/v3d_sched.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/v3d/v3d_sched.c +0 -0
index a5501581d96b..9243dea6e6ad 100644

drivers/gpu/drm/v3d/v3d_sched.c v3d_job_timedout(struct drm_sched_job *sched_job) · line 174

Quoted 8 lines
drivers/gpu/drm/v3d/v3d_sched.c +1 -1
@@ -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;
  	}

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel