Skip to content

Commit 628e1ac

Browse files
Sreekant Somasekharanalexdeucher
authored andcommitted
drm/amdkfd: mark GFX12 system and peer GPU memory mappings as MTYPE_NC
Due to a HW bug, the system memory mappings and peer GPU mappings on GFX12 need to be marked as MTYPE_NC. Cc: Joe Greathouse <joseph.greathouse@amd.com> Cc: David Belanger <david.belanger@amd.com> Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com> Signed-off-by: Sreekant Somasekharan <sreekant.somasekharan@amd.com> Reviewed-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent a8a4615 commit 628e1ac

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,10 @@ static void gmc_v12_0_get_vm_pte(struct amdgpu_device *adev,
497497
uint64_t *flags)
498498
{
499499
struct amdgpu_bo *bo = mapping->bo_va->base.bo;
500+
struct amdgpu_device *bo_adev = amdgpu_ttm_adev(bo->tbo.bdev);
501+
bool coherent = bo->flags & AMDGPU_GEM_CREATE_COHERENT;
502+
bool is_system = bo->tbo.resource->mem_type == TTM_PL_SYSTEM;
503+
500504

501505
*flags &= ~AMDGPU_PTE_EXECUTABLE;
502506
*flags |= mapping->flags & AMDGPU_PTE_EXECUTABLE;
@@ -515,6 +519,11 @@ static void gmc_v12_0_get_vm_pte(struct amdgpu_device *adev,
515519
AMDGPU_GEM_CREATE_UNCACHED))
516520
*flags = (*flags & ~AMDGPU_PTE_MTYPE_GFX12_MASK) |
517521
AMDGPU_PTE_MTYPE_GFX12(MTYPE_UC);
522+
523+
/* WA for HW bug */
524+
if ((bo && is_system) || ((bo_adev != adev) && coherent))
525+
*flags |= AMDGPU_PTE_MTYPE_GFX12(MTYPE_NC);
526+
518527
}
519528

520529
static unsigned gmc_v12_0_get_vbios_fb_size(struct amdgpu_device *adev)

drivers/gpu/drm/amd/amdkfd/kfd_svm.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,15 @@ svm_range_get_pte_flags(struct kfd_node *node,
12491249
mapping_flags |= AMDGPU_VM_MTYPE_UC;
12501250
}
12511251
break;
1252+
case IP_VERSION(12, 0, 0):
1253+
if (domain == SVM_RANGE_VRAM_DOMAIN) {
1254+
if (bo_node != node)
1255+
mapping_flags |= AMDGPU_VM_MTYPE_NC;
1256+
} else {
1257+
mapping_flags |= coherent ?
1258+
AMDGPU_VM_MTYPE_UC : AMDGPU_VM_MTYPE_NC;
1259+
}
1260+
break;
12521261
default:
12531262
mapping_flags |= coherent ?
12541263
AMDGPU_VM_MTYPE_UC : AMDGPU_VM_MTYPE_NC;

0 commit comments

Comments
 (0)