From: Sreekant Somasekharan Date: Fri, 10 May 2024 04:09:32 +0000 (-0400) Subject: drm/amdkfd: Check correct memory types for is_system variable X-Git-Tag: v6.11-rc1~141^2~25^2~185 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cce5f285d9ae81c33993f3270fe77f5e74a69ab;p=thirdparty%2Fkernel%2Flinux.git drm/amdkfd: Check correct memory types for is_system variable To catch GPU mapping of system memory, TTM_PL_TT and AMDGPU_PL_PREEMPT must be checked. Fixes: 628e1ace2379 ("drm/amdkfd: mark GFX12 system and peer GPU memory mappings as MTYPE_NC") Signed-off-by: Sreekant Somasekharan Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c index 34e751b9b7003..00b7aef6bdb08 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c @@ -524,7 +524,8 @@ static void gmc_v12_0_get_vm_pte(struct amdgpu_device *adev, bo_adev = amdgpu_ttm_adev(bo->tbo.bdev); coherent = bo->flags & AMDGPU_GEM_CREATE_COHERENT; - is_system = bo->tbo.resource->mem_type == TTM_PL_SYSTEM; + is_system = (bo->tbo.resource->mem_type == TTM_PL_TT) || + (bo->tbo.resource->mem_type == AMDGPU_PL_PREEMPT); /* WA for HW bug */ if (is_system || ((bo_adev != adev) && coherent))