<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> </head> <body> Well none. As I said I will push this upstream through drm-misc-next.<br> <br> Christian.<br> <br> <div class="moz-cite-prefix">Am 28.04.21 um 10:32 schrieb Deng, Emily:<br> </div> <blockquote type="cite" cite="mid:BY5PR12MB41150F5816B764A3E619AB4F8F409@BY5PR12MB4115.namprd12.prod.outlook.com"> <meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)">  <style>@font-face {font-family:"Cambria Math"; panose-1:2 4 5 3 5 4 6 3 2 4;}@font-face {font-family:DengXian; panose-1:2 1 6 0 3 1 1 1 1 1;}@font-face {font-family:Calibri; panose-1:2 15 5 2 2 2 4 3 2 4;}@font-face {font-family:"\@DengXian"; panose-1:2 1 6 0 3 1 1 1 1 1;}p.MsoNormal, li.MsoNormal, div.MsoNormal {margin:0in; font-size:11.0pt; font-family:"Calibri",sans-serif;}a:link, span.MsoHyperlink {mso-style-priority:99; color:blue; text-decoration:underline;}span.EmailStyle20 {mso-style-type:personal-reply; font-family:"Calibri",sans-serif; color:windowtext;}.MsoChpDefault {mso-style-type:export-only; font-size:10.0pt;}div.WordSection1 {page:WordSection1;}</style> <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 class="WordSection1"> <p class="MsoNormal">Hi Alex and Christian,<o:p></o:p></p> <p class="MsoNormal" style="text-indent:10.0pt">What extra work Roy need to do about this patch? And fdinfo?<o:p></o:p></p> <p class="MsoNormal"><o:p> </o:p></p> <p class="MsoNormal">Best wishes<o:p></o:p></p> <p class="MsoNormal">Emily Deng<o:p></o:p></p> <div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt"> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> <p class="MsoNormal"><b>From:</b> amd-gfx <a class="moz-txt-link-rfc2396E" href="mailto:amd-gfx-bounces@lists.freedesktop.org"><amd-gfx-bounces@lists.freedesktop.org></a> <b>On Behalf Of </b>Deucher, Alexander<br> <b>Sent:</b> Tuesday, April 27, 2021 3:52 AM<br> <b>To:</b> Christian König <a class="moz-txt-link-rfc2396E" href="mailto:ckoenig.leichtzumerken@gmail.com"><ckoenig.leichtzumerken@gmail.com></a><br> <b>Cc:</b> Sun, Roy <a class="moz-txt-link-rfc2396E" href="mailto:Roy.Sun@amd.com"><Roy.Sun@amd.com></a>; amd-gfx list <a class="moz-txt-link-rfc2396E" href="mailto:amd-gfx@lists.freedesktop.org"><amd-gfx@lists.freedesktop.org></a>; Nieto, David M <a class="moz-txt-link-rfc2396E" href="mailto:David.Nieto@amd.com"><David.Nieto@amd.com></a><br> <b>Subject:</b> Re: [PATCH 1/2] drm/scheduler: Change scheduled fence track<o:p></o:p></p> </div> </div> <p class="MsoNormal"><o:p> </o:p></p> <p style="margin:5.0pt"><span style="font-family:"Arial",sans-serif;color:#0078D7">[AMD Official Use Only - Internal Distribution Only]<o:p></o:p></span></p> <p class="MsoNormal"><o:p> </o:p></p> <div> <p style="margin:5.0pt"><span style="font-family:"Arial",sans-serif;color:#0078D7">[AMD Official Use Only - Internal Distribution Only]<o:p></o:p></span></p> <p class="MsoNormal"><o:p> </o:p></p> <div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black">Fair point. Either way works for me.<o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black"><o:p> </o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black">Alex<o:p></o:p></span></p> </div> <div class="MsoNormal" style="text-align:center" align="center"> <hr width="98%" size="2" align="center"> </div> <div id="divRplyFwdMsg"> <p class="MsoNormal"><b><span style="color:black">From:</span></b><span style="color:black"> Christian König <<a href="mailto:ckoenig.leichtzumerken@gmail.com" moz-do-not-send="true">ckoenig.leichtzumerken@gmail.com</a>><br> <b>Sent:</b> Monday, April 26, 2021 3:48 PM<br> <b>To:</b> Deucher, Alexander <<a href="mailto:Alexander.Deucher@amd.com" moz-do-not-send="true">Alexander.Deucher@amd.com</a>><br> <b>Cc:</b> amd-gfx list <<a href="mailto:amd-gfx@lists.freedesktop.org" moz-do-not-send="true">amd-gfx@lists.freedesktop.org</a>>; Sun, Roy <<a href="mailto:Roy.Sun@amd.com" moz-do-not-send="true">Roy.Sun@amd.com</a>>; Nieto, David M <<a href="mailto:David.Nieto@amd.com" moz-do-not-send="true">David.Nieto@amd.com</a>><br> <b>Subject:</b> Re: [PATCH 1/2] drm/scheduler: Change scheduled fence track</span> <o:p></o:p></p> <div> <p class="MsoNormal"> <o:p></o:p></p> </div> </div> <div> <p class="MsoNormal" style="margin-bottom:12.0pt">My concern is more to get this tested from more people than just AMD.<br> <br> Christian.<o:p></o:p></p> <div> <p class="MsoNormal">Am 26.04.21 um 21:40 schrieb Deucher, Alexander:<o:p></o:p></p> </div> <blockquote style="margin-top:5.0pt;margin-bottom:5.0pt"> <p style="margin:5.0pt"><span style="font-family:"Arial",sans-serif;color:#0078D7">[AMD Official Use Only - Internal Distribution Only]<o:p></o:p></span></p> <p class="MsoNormal"><o:p> </o:p></p> <div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black">That said, it would be easier for me to merge through the AMD tree since a relatively big AMD feature depends on it. Not sure how much conflict potential there is if this goes through the AMD tree.<o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black"><o:p> </o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black">Alex<o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black"><o:p> </o:p></span></p> </div> <div class="MsoNormal" style="text-align:center" align="center"> <hr width="98%" size="2" align="center"> </div> <div id="x_divRplyFwdMsg"> <p class="MsoNormal"><b><span style="color:black">From:</span></b><span style="color:black"> amd-gfx <a href="mailto:amd-gfx-bounces@lists.freedesktop.org" moz-do-not-send="true"><amd-gfx-bounces@lists.freedesktop.org></a> on behalf of Deucher, Alexander <a href="mailto:Alexander.Deucher@amd.com" moz-do-not-send="true"><Alexander.Deucher@amd.com></a><br> <b>Sent:</b> Monday, April 26, 2021 3:24 PM<br> <b>To:</b> Christian König <a href="mailto:ckoenig.leichtzumerken@gmail.com" moz-do-not-send="true"><ckoenig.leichtzumerken@gmail.com></a><br> <b>Cc:</b> amd-gfx list <a href="mailto:amd-gfx@lists.freedesktop.org" moz-do-not-send="true"><amd-gfx@lists.freedesktop.org></a>; Sun, Roy <a href="mailto:Roy.Sun@amd.com" moz-do-not-send="true"><Roy.Sun@amd.com></a>; Nieto, David M <a href="mailto:David.Nieto@amd.com" moz-do-not-send="true"> <David.Nieto@amd.com></a><br> <b>Subject:</b> Re: [PATCH 1/2] drm/scheduler: Change scheduled fence track</span> <o:p></o:p></p> <div> <p class="MsoNormal"> <o:p></o:p></p> </div> </div> <div> <p style="margin:5.0pt"><span style="font-family:"Arial",sans-serif;color:#0078D7">[AMD Official Use Only - Internal Distribution Only]<o:p></o:p></span></p> <p class="MsoNormal"><o:p> </o:p></p> <div> <p style="margin:5.0pt"><span style="font-family:"Arial",sans-serif;color:#0078D7">[AMD Official Use Only - Internal Distribution Only]<o:p></o:p></span></p> <p class="MsoNormal"><o:p> </o:p></p> <div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black">No objections from me.<o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black"><o:p> </o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black">Thanks!<o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black"><o:p> </o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black">Alex<o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;color:black"><o:p> </o:p></span></p> </div> <div class="MsoNormal" style="text-align:center" align="center"> <hr width="98%" size="2" align="center"> </div> <div id="x_x_divRplyFwdMsg"> <p class="MsoNormal"><b><span style="color:black">From:</span></b><span style="color:black"> Christian König <a href="mailto:ckoenig.leichtzumerken@gmail.com" moz-do-not-send="true"><ckoenig.leichtzumerken@gmail.com></a><br> <b>Sent:</b> Monday, April 26, 2021 2:49 AM<br> <b>To:</b> Deucher, Alexander <a href="mailto:Alexander.Deucher@amd.com" moz-do-not-send="true"><Alexander.Deucher@amd.com></a><br> <b>Cc:</b> Nieto, David M <a href="mailto:David.Nieto@amd.com" moz-do-not-send="true"><David.Nieto@amd.com></a>; Sun, Roy <a href="mailto:Roy.Sun@amd.com" moz-do-not-send="true"><Roy.Sun@amd.com></a>; amd-gfx list <a href="mailto:amd-gfx@lists.freedesktop.org" moz-do-not-send="true"> <amd-gfx@lists.freedesktop.org></a><br> <b>Subject:</b> Re: [PATCH 1/2] drm/scheduler: Change scheduled fence track</span> <o:p></o:p></p> <div> <p class="MsoNormal"> <o:p></o:p></p> </div> </div> <div> <div> <p class="MsoNormal" style="margin-bottom:12.0pt">Hey Alex,<br> <br> any objections that we merge those two patches through drm-misc-next?<br> <br> Thanks,<br> Christian.<br> <br> Am 26.04.21 um 08:27 schrieb Roy Sun:<br> > Update the timestamp of scheduled fence on HW<br> > completion of the previous fences<br> ><br> > This allow more accurate tracking of the fence<br> > execution in HW<br> ><br> > Signed-off-by: David M Nieto <a href="mailto:david.nieto@amd.com" moz-do-not-send="true"><david.nieto@amd.com></a><br> > Signed-off-by: Roy Sun <a href="mailto:Roy.Sun@amd.com" moz-do-not-send="true"><Roy.Sun@amd.com></a><br> > ---<br> > drivers/gpu/drm/scheduler/sched_main.c | 12 ++++++++++--<br> > 1 file changed, 10 insertions(+), 2 deletions(-)<br> ><br> > diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c<br> > index 92d8de24d0a1..f8e39ab0c41b 100644<br> > --- a/drivers/gpu/drm/scheduler/sched_main.c<br> > +++ b/drivers/gpu/drm/scheduler/sched_main.c<br> > @@ -515,7 +515,7 @@ void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched)<br> > EXPORT_SYMBOL(drm_sched_resubmit_jobs);<br> > <br> > /**<br> > - * drm_sched_resubmit_jobs_ext - helper to relunch certain number of jobs from mirror ring list<br> > + * drm_sched_resubmit_jobs_ext - helper to relaunch certain number of jobs from pending list<br> > *<br> > * @sched: scheduler instance<br> > * @max: job numbers to relaunch<br> > @@ -671,7 +671,7 @@ drm_sched_select_entity(struct drm_gpu_scheduler *sched)<br> > static struct drm_sched_job *<br> > drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)<br> > {<br> > - struct drm_sched_job *job;<br> > + struct drm_sched_job *job, *next;<br> > <br> > /*<br> > * Don't destroy jobs while the timeout worker is running OR thread<br> > @@ -690,6 +690,14 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)<br> > if (job && dma_fence_is_signaled(&job->s_fence->finished)) {<br> > /* remove job from pending_list */<br> > list_del_init(&job->list);<br> > We just need to record the scheduled time of the next job. So we<br> > need not to check the rest job.<br> > + /* account for the next fence in the queue */<br> > + next = list_first_entry_or_null(&sched->pending_list,<br> > + struct drm_sched_job, list);<br> > + if (next && test_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT,<br> > + &job->s_fence->finished.flags)) {<br> > + next->s_fence->scheduled.timestamp =<br> > + job->s_fence->finished.timestamp;<br> > + }<br> > } else {<br> > job = NULL;<br> > /* queue timeout for next job */<o:p></o:p></p> </div> </div> </div> </div> </div> </div> </blockquote> <p class="MsoNormal"><o:p> </o:p></p> </div> </div> </div> </div> </div> </div> </blockquote> <br> </body> </html>