<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:10pt;color:#008000;margin:15pt;" align="Left">
[Public]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);" class="elementToProof">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);">
<br>
</div>
<div>
<blockquote class="userQuote" style="border-left: 3px solid rgb(200, 200, 200); padding-left: 1ex; margin-left: 0.8ex; color: rgb(102, 102, 102);" itemscope="" itemtype="https://schemas.microsoft.com/QuotedText">
This shouldn't be necessary as it tries both mm and then reg...</blockquote>
<br>
</div>
</div>
Yeah I know, but it just seemed cleaner that way...<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> StDenis, Tom <Tom.StDenis@amd.com><br>
<b>Sent:</b> Tuesday, June 6, 2023 13:34<br>
<b>To:</b> Haehnle, Nicolai <Nicolai.Haehnle@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Subject:</b> Re: [PATCH umr 02/17] Use the correct prefix for Navi3 in halt_waves</font>
<div> </div>
</div>
<div class="BodyFragment"><font face="Times New Roman" size="3"><span style="font-size:12pt;"><a name="BM_BEGIN"></a>
<div><font size="2"><span style="font-size:11pt;">[Public]<br>
<br>
This shouldn't be necessary as it tries both mm and then reg...<br>
<br>
<br>
________________________________________<br>
From: Haehnle, Nicolai <Nicolai.Haehnle@amd.com><br>
Sent: Tuesday, June 6, 2023 05:17<br>
To: amd-gfx@lists.freedesktop.org; StDenis, Tom<br>
Cc: Haehnle, Nicolai<br>
Subject: [PATCH umr 02/17] Use the correct prefix for Navi3 in halt_waves<br>
<br>
Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com><br>
---<br>
src/lib/sq_cmd_halt_waves.c | 3 ++-<br>
1 file changed, 2 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/lib/sq_cmd_halt_waves.c b/src/lib/sq_cmd_halt_waves.c<br>
index 368e701..841b1d3 100644<br>
--- a/src/lib/sq_cmd_halt_waves.c<br>
+++ b/src/lib/sq_cmd_halt_waves.c<br>
@@ -36,21 +36,22 @@ int umr_sq_cmd_halt_waves(struct umr_asic *asic, enum umr_sq_cmd_halt_resume mod<br>
uint32_t value;<br>
uint64_t addr;<br>
struct {<br>
uint32_t se, sh, instance, use_grbm;<br>
} grbm;<br>
<br>
// SQ_CMD is not present on SI<br>
if (asic->family == FAMILY_SI)<br>
return 0;<br>
<br>
- reg = umr_find_reg_data_by_ip_by_instance(asic, "gfx", asic->options.vm_partition, "mmSQ_CMD");<br>
+ reg = umr_find_reg_data_by_ip_by_instance(asic, "gfx", asic->options.vm_partition,<br>
+ asic->family >= FAMILY_GFX11 ? "regSQ_CMD" : "mmSQ_CMD");<br>
if (!reg) {<br>
asic->err_msg("[BUG]: Cannot find SQ_CMD register in umr_sq_cmd_halt_waves()\n");<br>
return -1;<br>
}<br>
<br>
// compose value<br>
if (asic->family == FAMILY_CIK) {<br>
value = umr_bitslice_compose_value(asic, reg, "CMD", mode == UMR_SQ_CMD_HALT ? 1 : 2); // SETHALT<br>
} else {<br>
value = umr_bitslice_compose_value(asic, reg, "CMD", 1); // SETHALT<br>
--<br>
2.40.0<br>
<br>
</span></font></div>
</span></font></div>
</div>
</body>
</html>