<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<!--[if !mso]><style>v\:* {behavior:url(#default#VML);}
o\:* {behavior:url(#default#VML);}
w\:* {behavior:url(#default#VML);}
.shape {behavior:url(#default#VML);}
</style><![endif]--><style><!--
/* Font Definitions */
@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:Aptos;}
@font-face
{font-family:"\@DengXian";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
font-size:12.0pt;
font-family:"Aptos",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.msonormal0, li.msonormal0, div.msonormal0
{mso-style-name:msonormal;
margin:0in;
font-size:12.0pt;
font-family:"Aptos",sans-serif;}
p.elementtoproof, li.elementtoproof, div.elementtoproof
{mso-style-name:elementtoproof;
margin:0in;
font-size:12.0pt;
font-family:"Aptos",sans-serif;}
span.EmailStyle21
{mso-style-type:personal-reply;
font-family:"Arial",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;
mso-ligatures:none;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple" style="word-wrap:break-word">
<p style="font-family:Calibri;font-size:10pt;color:#008000;margin:5pt;font-style:normal;font-weight:normal;text-decoration:none;" align="Left">
[Public]<br>
</p>
<br>
<div>
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"> Mohan Marimuthu, Yogesh <Yogesh.Mohanmarimuthu@amd.com>
<br>
<b>Sent:</b> Sunday, May 18, 2025 3:53 PM<br>
<b>To:</b> Zhang, Jesse(Jie) <Jesse.Zhang@amd.com>; igt-dev@lists.freedesktop.org<br>
<b>Cc:</b> Prosyak, Vitaly <Vitaly.Prosyak@amd.com><br>
<b>Subject:</b> Re: [PATCH i-g-t 1/2] tests/amdgpu: userq skip waiting for signal fence<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p style="margin:5.0pt"><span style="font-size:10.0pt;font-family:"Calibri",sans-serif;color:green">[Public]<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div>
<p class="MsoNormal"><span style="color:black">Hi Jesse,<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black">I checked the timeout code in amdgpu_userqueue_submit(), this does not satisfy the requirement for fwm_preemption test case I am adding.<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black">In case of fwm_premption test case, unsatisfied fence will be added to FENCE_WAIT_MULTI packet, so amdgpu_cs_syncobj_wait will always timeout initially.<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black">This will lead to syncobj wait assert. I will have to skip synobj wait code in amdgpu_userqueue_submit().<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif"><o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif">Maybe we can return the result of amdgpu_cs_syncobj_wait in amdgpu_user_queue_submit.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif">And check the return result by igt_assert_eq(r, 0); or igt_assert_neq(r, 0); like this:<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif">r = amdgpu_user_queue_submit();<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif">igt_assert_neq(r, 0);<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Arial",sans-serif">Anyway, I am ok for
</span><span style="color:black">skip_signal<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:black"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:black">Regards<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:black">Jesse<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black">Thank you,<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black">Yogesh<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div class="MsoNormal" align="center" style="text-align:center">
<hr size="2" width="98%" align="center">
</div>
<div>
<p class="MsoNormal"><b><span style="font-family:"Calibri",sans-serif;color:black">From:</span></b><span style="font-family:"Calibri",sans-serif;color:black"> igt-dev <<a href="mailto:igt-dev-bounces@lists.freedesktop.org">igt-dev-bounces@lists.freedesktop.org</a>>
on behalf of Mohan Marimuthu, Yogesh <<a href="mailto:Yogesh.Mohanmarimuthu@amd.com">Yogesh.Mohanmarimuthu@amd.com</a>><br>
<b>Sent:</b> Friday, May 16, 2025 3:39 PM<br>
<b>To:</b> Zhang, Jesse(Jie) <<a href="mailto:Jesse.Zhang@amd.com">Jesse.Zhang@amd.com</a>>;
<a href="mailto:igt-dev@lists.freedesktop.org">igt-dev@lists.freedesktop.org</a> <<a href="mailto:igt-dev@lists.freedesktop.org">igt-dev@lists.freedesktop.org</a>><br>
<b>Cc:</b> Prosyak, Vitaly <<a href="mailto:Vitaly.Prosyak@amd.com">Vitaly.Prosyak@amd.com</a>><br>
<b>Subject:</b> Re: [PATCH i-g-t 1/2] tests/amdgpu: userq skip waiting for signal fence
<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<p style="margin:5.0pt"><span style="font-size:10.0pt;font-family:"Calibri",sans-serif;color:green">[Public]<o:p></o:p></span></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<p style="margin:5.0pt"><span style="font-size:10.0pt;font-family:"Calibri",sans-serif;color:green">[Public]<o:p></o:p></span></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black">Hi Jesse,<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black">Thank you for the review comments.<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="color:black">I will update the test case and send revised patch.<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;color:black">Thank you,<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;color:black">Yogesh<o:p></o:p></span></p>
</div>
<div class="MsoNormal" align="center" style="text-align:center">
<hr size="2" width="98%" align="center">
</div>
<div>
<p class="MsoNormal"><b><span style="font-family:"Calibri",sans-serif;color:black">From:</span></b><span style="font-family:"Calibri",sans-serif;color:black"> Zhang, Jesse(Jie) <<a href="mailto:Jesse.Zhang@amd.com">Jesse.Zhang@amd.com</a>><br>
<b>Sent:</b> Friday, May 16, 2025 2:36 PM<br>
<b>To:</b> Mohan Marimuthu, Yogesh <<a href="mailto:Yogesh.Mohanmarimuthu@amd.com">Yogesh.Mohanmarimuthu@amd.com</a>>;
<a href="mailto:igt-dev@lists.freedesktop.org">igt-dev@lists.freedesktop.org</a> <<a href="mailto:igt-dev@lists.freedesktop.org">igt-dev@lists.freedesktop.org</a>><br>
<b>Cc:</b> Prosyak, Vitaly <<a href="mailto:Vitaly.Prosyak@amd.com">Vitaly.Prosyak@amd.com</a>><br>
<b>Subject:</b> RE: [PATCH i-g-t 1/2] tests/amdgpu: userq skip waiting for signal fence<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<p style="margin:5.0pt"><span style="font-size:10.0pt;font-family:"Calibri",sans-serif;color:green">[Public]<o:p></o:p></span></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<p><span style="font-size:11.0pt;font-family:"Arial",sans-serif">hi Yogesh,</span><o:p></o:p></p>
<p><span style="font-size:11.0pt;font-family:"Arial",sans-serif"> </span><o:p></o:p></p>
<p class="elementtoproof"><span style="font-size:11.0pt;font-family:"Arial",sans-serif">Please pull the latest code, we can set a shorter timeout for amdgpu_cs_syncobj_wait to replace the skip flag.</span><o:p></o:p></p>
<p><span style="font-size:11.0pt;font-family:"Arial",sans-serif"> </span><o:p></o:p></p>
<p><span style="font-size:11.0pt;font-family:"Arial",sans-serif">Thanks</span><o:p></o:p></p>
<p><span style="font-size:11.0pt;font-family:"Arial",sans-serif">Jesse</span><o:p></o:p></p>
<p><span style="font-size:11.0pt;font-family:"Arial",sans-serif"> </span><o:p></o:p></p>
<p><span style="font-size:11.0pt;font-family:"Arial",sans-serif"> </span><o:p></o:p></p>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in">
<p><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"> igt-dev <<a href="mailto:igt-dev-bounces@lists.freedesktop.org">igt-dev-bounces@lists.freedesktop.org</a>>
<b>On Behalf Of </b>Mohan Marimuthu, Yogesh<br>
<b>Sent:</b> Friday, May 16, 2025 4:31 PM<br>
<b>To:</b> <a href="mailto:igt-dev@lists.freedesktop.org">igt-dev@lists.freedesktop.org</a><br>
<b>Cc:</b> Prosyak, Vitaly <<a href="mailto:Vitaly.Prosyak@amd.com">Vitaly.Prosyak@amd.com</a>><br>
<b>Subject:</b> [PATCH i-g-t 1/2] tests/amdgpu: userq skip waiting for signal fence</span><o:p></o:p></p>
</div>
<p> <o:p></o:p></p>
<p style="margin:5.0pt"><span style="font-size:10.0pt;font-family:"Calibri",sans-serif;color:green">[Public]</span><o:p></o:p></p>
<p> <o:p></o:p></p>
<p style="margin:5.0pt"><span style="font-size:10.0pt;font-family:"Calibri",sans-serif;color:green">[Public]</span><o:p></o:p></p>
<p> <o:p></o:p></p>
<p><span style="color:black">For negative test cases where the job will not complete need to</span><o:p></o:p></p>
<p><span style="color:black">skip signal fence. Pass a flag to amdgpu_user_queue_submit() to</span><o:p></o:p></p>
<p><span style="color:black">skip signal fence wait.</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black">Cc: Prosyak, Vitaly <</span><a href="mailto:Vitaly.Prosyak@amd.com">Vitaly.Prosyak@amd.com</a><span style="color:black">></span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black">Signed-off-by: Yogesh Mohan Marimuthu <</span><a href="mailto:yogesh.mohanmarimuthu@amd.com">yogesh.mohanmarimuthu@amd.com</a><span style="color:black">></span><o:p></o:p></p>
<p><span style="color:black">---</span><o:p></o:p></p>
<p><span style="color:black"> lib/amdgpu/amd_command_submission.c | 2 +-</span><o:p></o:p></p>
<p><span style="color:black"> lib/amdgpu/amd_compute.c | 2 +-</span><o:p></o:p></p>
<p><span style="color:black"> lib/amdgpu/amd_userq.c | 36 +++++++++++++++--------------</span><o:p></o:p></p>
<p><span style="color:black"> lib/amdgpu/amd_userq.h | 2 +-</span><o:p></o:p></p>
<p><span style="color:black"> tests/amdgpu/amd_basic.c | 4 ++--</span><o:p></o:p></p>
<p><span style="color:black"> tests/amdgpu/amd_cs_nop.c | 2 +-</span><o:p></o:p></p>
<p><span style="color:black"> 6 files changed, 25 insertions(+), 23 deletions(-)</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black">diff --git a/lib/amdgpu/amd_command_submission.c b/lib/amdgpu/amd_command_submission.c</span><o:p></o:p></p>
<p><span style="color:black">index 80d03a498..74091da5a 100644</span><o:p></o:p></p>
<p><span style="color:black">--- a/lib/amdgpu/amd_command_submission.c</span><o:p></o:p></p>
<p><span style="color:black">+++ b/lib/amdgpu/amd_command_submission.c</span><o:p></o:p></p>
<p><span style="color:black">@@ -68,7 +68,7 @@ int amdgpu_test_exec_cs_helper(amdgpu_device_handle device, unsigned int ip_type</span><o:p></o:p></p>
<p><span style="color:black"> memcpy(ring_ptr, ring_context->pm4, ring_context->pm4_dw * sizeof(*ring_context->pm4));</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black"> if (user_queue)</span><o:p></o:p></p>
<p><span style="color:black">- amdgpu_user_queue_submit(device, ring_context, ip_type, ib_result_mc_address);</span><o:p></o:p></p>
<p><span style="color:black">+ amdgpu_user_queue_submit(device, ring_context, ip_type, ib_result_mc_address, false);</span><o:p></o:p></p>
<p><span style="color:black"> else {</span><o:p></o:p></p>
<p><span style="color:black"> ring_context->ib_info.ib_mc_address = ib_result_mc_address;</span><o:p></o:p></p>
<p><span style="color:black"> ring_context->ib_info.size = ring_context->pm4_dw;</span><o:p></o:p></p>
<p><span style="color:black">diff --git a/lib/amdgpu/amd_compute.c b/lib/amdgpu/amd_compute.c</span><o:p></o:p></p>
<p><span style="color:black">index 95bfa53aa..008186049 100644</span><o:p></o:p></p>
<p><span style="color:black">--- a/lib/amdgpu/amd_compute.c</span><o:p></o:p></p>
<p><span style="color:black">+++ b/lib/amdgpu/amd_compute.c</span><o:p></o:p></p>
<p><span style="color:black">@@ -91,7 +91,7 @@ void amdgpu_command_submission_compute_nop(amdgpu_device_handle device, bool use</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black"> if (user_queue) {</span><o:p></o:p></p>
<p><span style="color:black"> amdgpu_user_queue_submit(device, ring_context, AMD_IP_COMPUTE,</span><o:p></o:p></p>
<p><span style="color:black">- ib_result_mc_address);</span><o:p></o:p></p>
<p><span style="color:black">+ ib_result_mc_address, false);</span><o:p></o:p></p>
<p><span style="color:black"> } else {</span><o:p></o:p></p>
<p><span style="color:black"> memset(&ib_info, 0, sizeof(struct amdgpu_cs_ib_info));</span><o:p></o:p></p>
<p><span style="color:black"> ib_info.ib_mc_address = ib_result_mc_address;</span><o:p></o:p></p>
<p><span style="color:black">diff --git a/lib/amdgpu/amd_userq.c b/lib/amdgpu/amd_userq.c</span><o:p></o:p></p>
<p><span style="color:black">index 50d058609..6593af822 100644</span><o:p></o:p></p>
<p><span style="color:black">--- a/lib/amdgpu/amd_userq.c</span><o:p></o:p></p>
<p><span style="color:black">+++ b/lib/amdgpu/amd_userq.c</span><o:p></o:p></p>
<p><span style="color:black">@@ -127,7 +127,7 @@ int amdgpu_timeline_syncobj_wait(amdgpu_device_handle device_handle,</span><o:p></o:p></p>
<p><span style="color:black"> }</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black"> void amdgpu_user_queue_submit(amdgpu_device_handle device, struct amdgpu_ring_context *ring_context,</span><o:p></o:p></p>
<p><span style="color:black">- unsigned int ip_type, uint64_t mc_address)</span><o:p></o:p></p>
<p><span style="color:black">+ unsigned int ip_type, uint64_t mc_address, bool skip_signal)</span><o:p></o:p></p>
<p><span style="font-size:11.0pt;font-family:"Arial",sans-serif"> </span><o:p></o:p></p>
<p><span style="color:black"> {</span><o:p></o:p></p>
<p><span style="color:black"> int r;</span><o:p></o:p></p>
<p><span style="color:black"> uint32_t control = ring_context->pm4_dw;</span><o:p></o:p></p>
<p><span style="color:black">@@ -166,22 +166,24 @@ void amdgpu_user_queue_submit(amdgpu_device_handle device, struct amdgpu_ring_co</span><o:p></o:p></p>
<p><span style="color:black"> /* Update the door bell */</span><o:p></o:p></p>
<p><span style="color:black"> ring_context->doorbell_cpu[DOORBELL_INDEX] = *ring_context->wptr_cpu;</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black">- /* Add a fence packet for signal */</span><o:p></o:p></p>
<p><span style="color:black">- syncarray[0] = ring_context->timeline_syncobj_handle;</span><o:p></o:p></p>
<p><span style="color:black">- signal_data.queue_id = ring_context->queue_id;</span><o:p></o:p></p>
<p><span style="color:black">- signal_data.syncobj_handles = (uintptr_t)syncarray;</span><o:p></o:p></p>
<p><span style="color:black">- signal_data.num_syncobj_handles = 1;</span><o:p></o:p></p>
<p><span style="color:black">- signal_data.bo_read_handles = 0;</span><o:p></o:p></p>
<p><span style="color:black">- signal_data.bo_write_handles = 0;</span><o:p></o:p></p>
<p><span style="color:black">- signal_data.num_bo_read_handles = 0;</span><o:p></o:p></p>
<p><span style="color:black">- signal_data.num_bo_write_handles = 0;</span><o:p></o:p></p>
<p><span style="color:black">-</span><o:p></o:p></p>
<p><span style="color:black">- r = amdgpu_userq_signal(device, &signal_data);</span><o:p></o:p></p>
<p><span style="color:black">- igt_assert_eq(r, 0);</span><o:p></o:p></p>
<p><span style="color:black">+ if (!skip_signal) {</span><o:p></o:p></p>
<p><span style="color:black">+ /* Add a fence packet for signal */</span><o:p></o:p></p>
<p><span style="color:black">+ syncarray[0] = ring_context->timeline_syncobj_handle;</span><o:p></o:p></p>
<p><span style="color:black">+ signal_data.queue_id = ring_context->queue_id;</span><o:p></o:p></p>
<p><span style="color:black">+ signal_data.syncobj_handles = (uintptr_t)syncarray;</span><o:p></o:p></p>
<p><span style="color:black">+ signal_data.num_syncobj_handles = 1;</span><o:p></o:p></p>
<p><span style="color:black">+ signal_data.bo_read_handles = 0;</span><o:p></o:p></p>
<p><span style="color:black">+ signal_data.bo_write_handles = 0;</span><o:p></o:p></p>
<p><span style="color:black">+ signal_data.num_bo_read_handles = 0;</span><o:p></o:p></p>
<p><span style="color:black">+ signal_data.num_bo_write_handles = 0;</span><o:p></o:p></p>
<p><span style="color:black">+</span><o:p></o:p></p>
<p><span style="color:black">+ r = amdgpu_userq_signal(device, &signal_data);</span><o:p></o:p></p>
<p><span style="color:black">+ igt_assert_eq(r, 0);</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black">- r = amdgpu_cs_syncobj_wait(device, &ring_context->timeline_syncobj_handle, 1, INT64_MAX,</span><o:p></o:p></p>
<p><span style="color:black">- DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL, NULL);</span><o:p></o:p></p>
<p><span style="color:black">- igt_assert_eq(r, 0);</span><o:p></o:p></p>
<p><span style="color:black">+ r = amdgpu_cs_syncobj_wait(device, &ring_context->timeline_syncobj_handle, 1,</span><o:p></o:p></p>
<p><span style="color:black">+ INT64_MAX, DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL, NULL);</span><o:p></o:p></p>
<p><span style="color:black">+ igt_assert_eq(r, 0);</span><o:p></o:p></p>
<p><span style="color:black">+ }</span><o:p></o:p></p>
<p><span style="color:black"> }</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black"> void amdgpu_user_queue_destroy(amdgpu_device_handle device_handle, struct amdgpu_ring_context *ctxt,</span><o:p></o:p></p>
<p><span style="color:black">@@ -456,7 +458,7 @@ int amdgpu_timeline_syncobj_wait(amdgpu_device_handle device_handle,</span><o:p></o:p></p>
<p><span style="color:black"> }</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black"> void amdgpu_user_queue_submit(amdgpu_device_handle device, struct amdgpu_ring_context *ring_context,</span><o:p></o:p></p>
<p><span style="color:black">- unsigned int ip_type, uint64_t mc_address)</span><o:p></o:p></p>
<p><span style="color:black">+ unsigned int ip_type, uint64_t mc_address, bool skip_signal)</span><o:p></o:p></p>
<p><span style="color:black"> {</span><o:p></o:p></p>
<p><span style="color:black"> }</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black">diff --git a/lib/amdgpu/amd_userq.h b/lib/amdgpu/amd_userq.h</span><o:p></o:p></p>
<p><span style="color:black">index b29e97ccf..dc39c1ca4 100644</span><o:p></o:p></p>
<p><span style="color:black">--- a/lib/amdgpu/amd_userq.h</span><o:p></o:p></p>
<p><span style="color:black">+++ b/lib/amdgpu/amd_userq.h</span><o:p></o:p></p>
<p><span style="color:black">@@ -50,6 +50,6 @@ void amdgpu_user_queue_destroy(amdgpu_device_handle device_handle, struct amdgpu</span><o:p></o:p></p>
<p><span style="color:black"> unsigned int ip_type);</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black"> void amdgpu_user_queue_submit(amdgpu_device_handle device, struct amdgpu_ring_context *ring_context,</span><o:p></o:p></p>
<p><span style="color:black">- unsigned int ip_type, uint64_t mc_address);</span><o:p></o:p></p>
<p><span style="color:black">+ unsigned int ip_type, uint64_t mc_address, bool skip_signal);</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
<p><span style="color:black"> #endif</span><o:p></o:p></p>
<p><span style="color:black">diff --git a/tests/amdgpu/amd_basic.c b/tests/amdgpu/amd_basic.c</span><o:p></o:p></p>
<p><span style="color:black">index 97a08a9a3..914d27909 100644</span><o:p></o:p></p>
<p><span style="color:black">--- a/tests/amdgpu/amd_basic.c</span><o:p></o:p></p>
<p><span style="color:black">+++ b/tests/amdgpu/amd_basic.c</span><o:p></o:p></p>
<p><span style="color:black">@@ -607,7 +607,7 @@ amdgpu_sync_dependency_test(amdgpu_device_handle device_handle, bool user_queue)</span><o:p></o:p></p>
<p><span style="color:black"> if (user_queue) {</span><o:p></o:p></p>
<p><span style="color:black"> ring_context->pm4_dw = ib_info.size;</span><o:p></o:p></p>
<p><span style="color:black"> amdgpu_user_queue_submit(device_handle, ring_context, ip_block->type,</span><o:p></o:p></p>
<p><span style="color:black">- ib_result_mc_address);</span><o:p></o:p></p>
<p><span style="color:black">+ ib_result_mc_address, false);</span><o:p></o:p></p>
<p><span style="color:black"> } else {</span><o:p></o:p></p>
<p><span style="color:black"> r = amdgpu_cs_submit(context_handle[1], 0, &ibs_request, 1);</span><o:p></o:p></p>
<p><span style="color:black"> }</span><o:p></o:p></p>
<p><span style="color:black">@@ -647,7 +647,7 @@ amdgpu_sync_dependency_test(amdgpu_device_handle device_handle, bool user_queue)</span><o:p></o:p></p>
<p><span style="color:black"> if (user_queue) {</span><o:p></o:p></p>
<p><span style="color:black"> ring_context->pm4_dw = ib_info.size;</span><o:p></o:p></p>
<p><span style="color:black"> amdgpu_user_queue_submit(device_handle, ring_context, ip_block->type,</span><o:p></o:p></p>
<p><span style="color:black">- ib_info.ib_mc_address);</span><o:p></o:p></p>
<p><span style="color:black">+ ib_info.ib_mc_address, false);</span><o:p></o:p></p>
<p><span style="color:black"> } else {</span><o:p></o:p></p>
<p><span style="color:black"> r = amdgpu_cs_submit(context_handle[0], 0, &ibs_request, 1);</span><o:p></o:p></p>
<p><span style="color:black"> igt_assert_eq(r, 0);</span><o:p></o:p></p>
<p><span style="color:black">diff --git a/tests/amdgpu/amd_cs_nop.c b/tests/amdgpu/amd_cs_nop.c</span><o:p></o:p></p>
<p><span style="color:black">index 268bc9201..658c8d050 100644</span><o:p></o:p></p>
<p><span style="color:black">--- a/tests/amdgpu/amd_cs_nop.c</span><o:p></o:p></p>
<p><span style="color:black">+++ b/tests/amdgpu/amd_cs_nop.c</span><o:p></o:p></p>
<p><span style="color:black">@@ -108,7 +108,7 @@ static void nop_cs(amdgpu_device_handle device,</span><o:p></o:p></p>
<p><span style="color:black"> if (user_queue) {</span><o:p></o:p></p>
<p><span style="color:black"> ring_context->pm4_dw = ib_info.size;</span><o:p></o:p></p>
<p><span style="color:black"> amdgpu_user_queue_submit(device, ring_context, ip_type,</span><o:p></o:p></p>
<p><span style="color:black">- ib_info.ib_mc_address);</span><o:p></o:p></p>
<p><span style="color:black">+ ib_info.ib_mc_address, false);</span><o:p></o:p></p>
<p><span style="color:black"> igt_assert_eq(r, 0);</span><o:p></o:p></p>
<p><span style="color:black"> } else {</span><o:p></o:p></p>
<p><span style="color:black"> r = amdgpu_cs_submit(context, 0, &ibs_request, 1);</span><o:p></o:p></p>
<p><span style="color:black">-- </span><o:p></o:p></p>
<p><span style="color:black">2.43.0</span><o:p></o:p></p>
<p><span style="color:black"> </span><o:p></o:p></p>
</div>
</div>
</div>
</body>
</html>