drm/amdgpu: Fix KFD doorbell SG BO mapping

This change prepares for adding SG BOs that will be used for mapping
doorbells into GPUVM address space.

This type of BO would be mistaken for an invalid userptr BO. Improve
that check to test that it's actually a userptr BO so that SG BOs that
are still in the CPU domain can be validated and mapped correctly.

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 572ac5fae924cdcbeede9824824260f855e475f9..84e4c1e4d1095823eec074801769001480110153 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1409,7 +1409,8 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
         * the queues are still stopped and we can leave mapping for
         * the next restore worker
         */
-       if (bo->tbo.mem.mem_type == TTM_PL_SYSTEM)
+       if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm) &&
+           bo->tbo.mem.mem_type == TTM_PL_SYSTEM)
                is_invalid_userptr = true;
 
        if (check_if_add_bo_to_vm(avm, mem)) {