<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 class="elementToProof" style="font-family: Tahoma, Geneva, sans-serif; font-size: 10pt; color: rgb(0, 0, 0);">
Done. Split the fixes to 2 different patches as well.</div>
<div class="elementToProof" style="font-family: Tahoma, Geneva, sans-serif; font-size: 10pt; color: rgb(0, 0, 0);">
<br>
</div>
<div id="Signature" style="color: inherit; background-color: inherit;">
<div style="background-color: rgb(255, 255, 255); font-family: Tahoma, Geneva, sans-serif; font-size: 10pt; color: rgb(0, 0, 0);">
Regards,</div>
<div style="background-color: rgb(255, 255, 255); font-family: Tahoma, Geneva, sans-serif; font-size: 10pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="background-color: rgb(255, 255, 255); font-family: Tahoma, Geneva, sans-serif; font-size: 10pt; color: rgb(0, 0, 0);">
-Sreekant</div>
<div style="margin: 0px 0in 0.0001333px; font-family: Calibri, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);">
<br>
</div>
<span style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"><br>
</span></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> Russell, Kent <Kent.Russell@amd.com><br>
<b>Sent:</b> Friday, May 10, 2024 9:15 AM<br>
<b>To:</b> Somasekharan, Sreekant <Sreekant.Somasekharan@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Kuehling, Felix <Felix.Kuehling@amd.com>; Somasekharan, Sreekant <Sreekant.Somasekharan@amd.com><br>
<b>Subject:</b> RE: [PATCH 2/2] drm/amdkfd: Minor corrections to a previous commit</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;">[AMD Official Use Only - General]<br>
<br>
You should add a Fixes tag for this patch.<br>
<br>
Kent<br>
<br>
> -----Original Message-----<br>
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Sreekant<br>
> Somasekharan<br>
> Sent: Friday, May 10, 2024 12:56 AM<br>
> To: amd-gfx@lists.freedesktop.org<br>
> Cc: Kuehling, Felix <Felix.Kuehling@amd.com>; Somasekharan, Sreekant<br>
> <Sreekant.Somasekharan@amd.com><br>
> Subject: [PATCH 2/2] drm/amdkfd: Minor corrections to a previous commit<br>
><br>
> This patch rectifies mistake in previous commit:<br>
> 'drm/amdkfd: mark GFX12 system and peer GPU memory mappings as<br>
> MTYPE_NC'.<br>
><br>
> Signed-off-by: Sreekant Somasekharan <sreekant.somasekharan@amd.com><br>
> ---<br>
> drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 3 ++-<br>
> drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 1 +<br>
> 2 files changed, 3 insertions(+), 1 deletion(-)<br>
><br>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c<br>
> b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c<br>
> index df0363ad1a51..6eb370609d01 100644<br>
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c<br>
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c<br>
> @@ -495,7 +495,8 @@ static void gmc_v12_0_get_vm_pte(struct<br>
> amdgpu_device *adev,<br>
> struct amdgpu_bo *bo = mapping->bo_va->base.bo;<br>
> struct amdgpu_device *bo_adev = amdgpu_ttm_adev(bo->tbo.bdev);<br>
> bool coherent = bo->flags & AMDGPU_GEM_CREATE_COHERENT;<br>
> - bool is_system = bo->tbo.resource->mem_type == TTM_PL_SYSTEM;<br>
> + bool is_system = (bo->tbo.resource->mem_type == TTM_PL_TT) ||<br>
> + (bo->tbo.resource->mem_type == AMDGPU_PL_PREEMPT);<br>
><br>
><br>
> *flags &= ~AMDGPU_PTE_EXECUTABLE;<br>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c<br>
> b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c<br>
> index 2aea33d2c4d4..6175800f50f3 100644<br>
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c<br>
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c<br>
> @@ -1253,6 +1253,7 @@ svm_range_get_pte_flags(struct kfd_node *node,<br>
> }<br>
> break;<br>
> case IP_VERSION(12, 0, 0):<br>
> + case IP_VERSION(12, 0, 1):<br>
> if (domain == SVM_RANGE_VRAM_DOMAIN) {<br>
> if (bo_node != node)<br>
> mapping_flags |= AMDGPU_VM_MTYPE_NC;<br>
> --<br>
> 2.34.1<br>
<br>
</span></font></div>
</span></font></div>
</div>
</body>
</html>