| Message ID | 20230919050155.2647172-9-matthew.brost@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | DRM scheduler changes for Xe | expand |
Hi, On 2023-09-19 01:01, Matthew Brost wrote: > If the TDR is set to a value, it can fire before a job is submitted in > drm_sched_main. The job should be always be submitted before the TDR > fires, fix this ordering. > > v2: > - Add to pending list before run_job, start TDR after (Luben, Boris) > > Signed-off-by: Matthew Brost <matthew.brost@intel.com> > --- > drivers/gpu/drm/scheduler/sched_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c > index a5cc9b6c2faa..e8a3e6033f66 100644 > --- a/drivers/gpu/drm/scheduler/sched_main.c > +++ b/drivers/gpu/drm/scheduler/sched_main.c > @@ -517,7 +517,6 @@ static void drm_sched_job_begin(struct drm_sched_job *s_job) > > spin_lock(&sched->job_list_lock); > list_add_tail(&s_job->list, &sched->pending_list); > - drm_sched_start_timeout(sched); > spin_unlock(&sched->job_list_lock); > } > > @@ -1138,6 +1137,7 @@ static void drm_sched_run_job_work(struct work_struct *w) > fence = sched->ops->run_job(sched_job); > complete_all(&entity->entity_idle); > drm_sched_fence_scheduled(s_fence, fence); > + drm_sched_start_timeout_unlocked(sched); > > if (!IS_ERR_OR_NULL(fence)) { > /* Drop for original kref_init of the fence */ No. See Message-ID: <ed3aca10-8a9f-4698-92f4-21558fa6cfe3@amd.com>, and Message-ID: <8e5eab14-9e55-42c9-b6ea-02fcc591266d@amd.com>, and Message-ID: <24bc965f-61fb-4b92-9afa-360ca85a53af@amd.com>.
On Fri, Sep 29, 2023 at 05:58:46PM -0400, Luben Tuikov wrote: > Hi, > > On 2023-09-19 01:01, Matthew Brost wrote: > > If the TDR is set to a value, it can fire before a job is submitted in > > drm_sched_main. The job should be always be submitted before the TDR > > fires, fix this ordering. > > > > v2: > > - Add to pending list before run_job, start TDR after (Luben, Boris) > > > > Signed-off-by: Matthew Brost <matthew.brost@intel.com> > > --- > > drivers/gpu/drm/scheduler/sched_main.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c > > index a5cc9b6c2faa..e8a3e6033f66 100644 > > --- a/drivers/gpu/drm/scheduler/sched_main.c > > +++ b/drivers/gpu/drm/scheduler/sched_main.c > > @@ -517,7 +517,6 @@ static void drm_sched_job_begin(struct drm_sched_job *s_job) > > > > spin_lock(&sched->job_list_lock); > > list_add_tail(&s_job->list, &sched->pending_list); > > - drm_sched_start_timeout(sched); > > spin_unlock(&sched->job_list_lock); > > } > > > > @@ -1138,6 +1137,7 @@ static void drm_sched_run_job_work(struct work_struct *w) > > fence = sched->ops->run_job(sched_job); > > complete_all(&entity->entity_idle); > > drm_sched_fence_scheduled(s_fence, fence); > > + drm_sched_start_timeout_unlocked(sched); > > > > if (!IS_ERR_OR_NULL(fence)) { > > /* Drop for original kref_init of the fence */ > > No. > > See Message-ID: <ed3aca10-8a9f-4698-92f4-21558fa6cfe3@amd.com>, > and Message-ID: <8e5eab14-9e55-42c9-b6ea-02fcc591266d@amd.com>, > and Message-ID: <24bc965f-61fb-4b92-9afa-360ca85a53af@amd.com>. See reply to previous patch, will drop this. Matt > -- > Regards, > Luben >
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index a5cc9b6c2faa..e8a3e6033f66 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -517,7 +517,6 @@ static void drm_sched_job_begin(struct drm_sched_job *s_job) spin_lock(&sched->job_list_lock); list_add_tail(&s_job->list, &sched->pending_list); - drm_sched_start_timeout(sched); spin_unlock(&sched->job_list_lock); } @@ -1138,6 +1137,7 @@ static void drm_sched_run_job_work(struct work_struct *w) fence = sched->ops->run_job(sched_job); complete_all(&entity->entity_idle); drm_sched_fence_scheduled(s_fence, fence); + drm_sched_start_timeout_unlocked(sched); if (!IS_ERR_OR_NULL(fence)) { /* Drop for original kref_init of the fence */
If the TDR is set to a value, it can fire before a job is submitted in drm_sched_main. The job should be always be submitted before the TDR fires, fix this ordering. v2: - Add to pending list before run_job, start TDR after (Luben, Boris) Signed-off-by: Matthew Brost <matthew.brost@intel.com> --- drivers/gpu/drm/scheduler/sched_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)