<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<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:#0000FF;margin:5pt;font-style:normal;font-weight:normal;text-decoration:none;" align="Left">
[AMD Official Use Only - General]<br>
</p>
<br>
<div>
<div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
Acked-by: Alex Deucher <alexander.deucher@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> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com><br>
<b>Sent:</b> Friday, August 25, 2023 5:30 PM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Cornwall, Jay <Jay.Cornwall@amd.com>; Kasiviswanathan, Harish <Harish.Kasiviswanathan@amd.com><br>
<b>Subject:</b> [PATCH] drm/amdkfd: Add missing gfx11 MQD manager callbacks</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">From: Jay Cornwall <jay.cornwall@amd.com><br>
<br>
mqd_stride function was introduced in commit 129c7b6a0217<br>
("drm/amdkfd: Update MQD management on multi XCC setup")<br>
but not assigned for gfx11. Fixes a NULL dereference in debugfs.<br>
<br>
Signed-off-by: Jay Cornwall <jay.cornwall@amd.com><br>
Signed-off-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 3 +++<br>
1 file changed, 3 insertions(+)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c<br>
index 2319467d2d95..0bbf0edbabd4 100644<br>
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c<br>
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c<br>
@@ -457,6 +457,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type,<br>
mqd->is_occupied = kfd_is_occupied_cp;<br>
mqd->mqd_size = sizeof(struct v11_compute_mqd);<br>
mqd->get_wave_state = get_wave_state;<br>
+ mqd->mqd_stride = kfd_mqd_stride;<br>
#if defined(CONFIG_DEBUG_FS)<br>
mqd->debugfs_show_mqd = debugfs_show_mqd;<br>
#endif<br>
@@ -472,6 +473,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type,<br>
mqd->destroy_mqd = destroy_hiq_mqd;<br>
mqd->is_occupied = kfd_is_occupied_cp;<br>
mqd->mqd_size = sizeof(struct v11_compute_mqd);<br>
+ mqd->mqd_stride = kfd_mqd_stride;<br>
#if defined(CONFIG_DEBUG_FS)<br>
mqd->debugfs_show_mqd = debugfs_show_mqd;<br>
#endif<br>
@@ -501,6 +503,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type,<br>
mqd->destroy_mqd = kfd_destroy_mqd_sdma;<br>
mqd->is_occupied = kfd_is_occupied_sdma;<br>
mqd->mqd_size = sizeof(struct v11_sdma_mqd);<br>
+ mqd->mqd_stride = kfd_mqd_stride;<br>
#if defined(CONFIG_DEBUG_FS)<br>
mqd->debugfs_show_mqd = debugfs_show_mqd_sdma;<br>
#endif<br>
-- <br>
2.34.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>