From 235f01a7127bde6d9b800b5b4b17784e24ac4329 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Tue, 4 Oct 2016 13:32:56 -0400 Subject: [PATCH 1197/4131] drm/amdgpu: Remove kfd_process_device usage in amdgpu side Change-Id: Ieb438f239eca9ecc5f015ca77b8a0f25c6213f61 Signed-off-by: Yong Zhao Conflicts: drivers/gpu/drm/amd/amdgpu/amdgpu.h --- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ++-- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index 5e206e4..a828572 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -1177,7 +1177,7 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep, err = dev->kfd2kgd->alloc_memory_of_gpu( dev->kgd, args->va_addr, args->size, - pdd->vm, (struct kgd_mem **) &mem, NULL, NULL, pdd, 0); + pdd->vm, (struct kgd_mem **) &mem, NULL, NULL, 0); if (err != 0) return err; @@ -1318,7 +1318,7 @@ static int kfd_ioctl_alloc_memory_of_gpu_new(struct file *filep, err = dev->kfd2kgd->alloc_memory_of_gpu( dev->kgd, args->va_addr, args->size, pdd->vm, (struct kgd_mem **) &mem, &offset, - NULL, pdd, alloc_flags); + NULL, alloc_flags); if (err != 0) return err; diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 78a8cc9..717d4a7 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -100,7 +100,7 @@ static int kfd_process_alloc_gpuvm(struct kfd_process *p, err = kdev->kfd2kgd->alloc_memory_of_gpu(kdev->kgd, gpu_va, size, pdd->vm, - (struct kgd_mem **)&mem, NULL, kptr, pdd, + (struct kgd_mem **)&mem, NULL, kptr, ALLOC_MEM_FLAGS_GTT | ALLOC_MEM_FLAGS_NONPAGED | ALLOC_MEM_FLAGS_EXECUTE_ACCESS | -- 2.7.4