Merge tag 'drm-next-5.5-2019-10-09' of git://people.freedesktop.org/~agd5f/linux...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_amdkfd_gpuvm.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 1fbe81094b5f50d40dddeebea2eec564999880f9..a07897e21526145e6ee28fd9b9f38efaedb4d4e2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1128,7 +1128,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(
                alloc_flags = 0;
                if (!offset || !*offset)
                        return -EINVAL;
-               user_addr = *offset;
+               user_addr = untagged_addr(*offset);
        } else if (flags & (ALLOC_MEM_FLAGS_DOORBELL |
                        ALLOC_MEM_FLAGS_MMIO_REMAP)) {
                domain = AMDGPU_GEM_DOMAIN_GTT;