<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Mon, Aug 6, 2018 at 6:45 PM Christian König <<a href="mailto:ckoenig.leichtzumerken@gmail.com">ckoenig.leichtzumerken@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div text="#000000" bgcolor="#FFFFFF">
<div class="m_2321479661523521660moz-cite-prefix">Am 06.08.2018 um 15:11 schrieb Nayan
Deshmukh:<br>
</div>
<blockquote type="cite">
<div dir="ltr">
<div>Hi Christian,<br>
<br>
</div>
<div>
<div>
<div class="gmail_quote">
<div dir="ltr">On Mon, Aug 6, 2018 at 5:49 PM Christian
König <<a href="mailto:ckoenig.leichtzumerken@gmail.com" target="_blank">ckoenig.leichtzumerken@gmail.com</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Update
job earlier with the scheduler it is supposed to be
scheduled on.<br>
<br>
Otherwise we could incorrectly optimize dependencies
when moving an<br>
entity from one scheduler to another.<br>
</blockquote>
<div>I don't think change is really required, the old code
should work fine. Read below for more comments.<br>
</div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Signed-off-by: Christian König <<a href="mailto:christian.koenig@amd.com" target="_blank">christian.koenig@amd.com</a>><br>
---<br>
drivers/gpu/drm/scheduler/gpu_scheduler.c | 4 ++--<br>
drivers/gpu/drm/scheduler/sched_fence.c | 2 +-<br>
2 files changed, 3 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c
b/drivers/gpu/drm/scheduler/gpu_scheduler.c<br>
index 65078dd3c82c..029863726c99 100644<br>
--- a/drivers/gpu/drm/scheduler/gpu_scheduler.c<br>
+++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c<br>
@@ -533,8 +533,6 @@ drm_sched_entity_pop_job(struct
drm_sched_entity *entity)<br>
if (!sched_job)<br>
return NULL;<br>
<br>
- sched_job->sched = sched;<br>
- sched_job->s_fence->sched = sched;<br>
while ((entity->dependency =
sched->ops->dependency(sched_job, entity))) <br>
</blockquote>
<div>The job should have the correct scheduler before the
sched->oops->dependency() function is called for
the first time. Hence I placed the assignment here.<br>
<br>
</div>
<div>It might also be that I am missing some case so
please let me know if such a case exists where this
might lead to wrong optimization.<br>
</div>
</div>
</div>
</div>
</div>
</blockquote>
<br>
The problem is that the scheduler fence of job A could be the
dependency of another job B<br>
<br>
Job B then makes an incorrect optimization because it sees the wrong
scheduler in the scheduler fence of job A.<br>
<br></div></blockquote><div>Ah..I missed this case. This make sense now. Reviewed-by: Nayan Deshmukh <<a href="mailto:nayan26deshmukh@gmail.com">nayan26deshmukh@gmail.com</a>><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div text="#000000" bgcolor="#FFFFFF">
Regards,<br>
Christian.<br>
<br>
<blockquote type="cite">
<div dir="ltr">
<div>
<div>
<div class="gmail_quote">
<div><br>
</div>
<div>Regards,<br>
</div>
<div>Nayan<br>
</div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
if
(drm_sched_entity_add_dependency_cb(entity))<br>
return NULL;<br>
@@ -581,6 +579,8 @@ void
drm_sched_entity_push_job(struct drm_sched_job
*sched_job,<br>
spin_unlock(&entity->rq_lock);<br>
}<br>
<br>
+ sched_job->sched = entity->rq->sched;<br>
+ sched_job->s_fence->sched =
entity->rq->sched;<br>
trace_drm_sched_job(sched_job, entity);<br>
atomic_inc(&entity->rq->sched->num_jobs);<br>
WRITE_ONCE(entity->last_user,
current->group_leader);<br>
diff --git a/drivers/gpu/drm/scheduler/sched_fence.c
b/drivers/gpu/drm/scheduler/sched_fence.c<br>
index 4029312fdd81..6dab18d288d7 100644<br>
--- a/drivers/gpu/drm/scheduler/sched_fence.c<br>
+++ b/drivers/gpu/drm/scheduler/sched_fence.c<br>
@@ -172,7 +172,7 @@ struct drm_sched_fence
*drm_sched_fence_create(struct drm_sched_entity *entity,<br>
return NULL;<br>
<br>
fence->owner = owner;<br>
- fence->sched = entity->rq->sched;<br>
+ fence->sched = NULL;<br>
spin_lock_init(&fence->lock);<br>
<br>
seq =
atomic_inc_return(&entity->fence_seq);<br>
-- <br>
2.14.1<br>
<br>
</blockquote>
</div>
</div>
</div>
</div>
</blockquote>
<br>
</div>
</blockquote></div></div>