<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<p style="font-family:Arial;font-size:11pt;color:#0078D7;margin:5pt;" align="Left">
[AMD Official Use Only - Internal Distribution Only]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Reviewed-by: Sonny Jiang <sonny.jiang@amd.com><br>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Christian König <ckoenig.leichtzumerken@gmail.com><br>
<b>Sent:</b> Friday, March 5, 2021 7:51 AM<br>
<b>To:</b> dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Liu, Leo <Leo.Liu@amd.com>; Jiang, Sonny <Sonny.Jiang@amd.com><br>
<b>Subject:</b> [PATCH 1/2] drm/sched: select new rq even if there is only one v3</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">This is necessary when changing priorities of an entity.<br>
<br>
v2: test the sched_list instead of num_sched.<br>
v3: set the sched_list to NULL when there is only one entry<br>
<br>
Signed-off-by: Christian König <christian.koenig@amd.com><br>
---<br>
drivers/gpu/drm/scheduler/sched_entity.c | 6 ++++--<br>
1 file changed, 4 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c<br>
index 92d965b629c6..f0790e9471d1 100644<br>
--- a/drivers/gpu/drm/scheduler/sched_entity.c<br>
+++ b/drivers/gpu/drm/scheduler/sched_entity.c<br>
@@ -453,7 +453,7 @@ void drm_sched_entity_select_rq(struct drm_sched_entity *entity)<br>
struct drm_gpu_scheduler *sched;<br>
struct drm_sched_rq *rq;<br>
<br>
- if (spsc_queue_count(&entity->job_queue) || entity->num_sched_list <= 1)<br>
+ if (spsc_queue_count(&entity->job_queue) || !entity->sched_list)<br>
return;<br>
<br>
fence = READ_ONCE(entity->last_scheduled);<br>
@@ -467,8 +467,10 @@ void drm_sched_entity_select_rq(struct drm_sched_entity *entity)<br>
drm_sched_rq_remove_entity(entity->rq, entity);<br>
entity->rq = rq;<br>
}<br>
-<br>
spin_unlock(&entity->rq_lock);<br>
+<br>
+ if (entity->num_sched_list == 1)<br>
+ entity->sched_list = NULL;<br>
}<br>
<br>
/**<br>
-- <br>
2.25.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>