diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-30 11:06:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-30 11:12:22 +1000 |
| commit | 568cf2e6aa0c762f14d2d0d481a006f93c63ab7a (patch) | |
| tree | 7216fd42ea3e61a6e2b368b1877e51d17a815af8 /drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | |
| parent | 74860cbfdd41e7490f506eae08a0e633be95cc0f (diff) | |
| parent | ebe1d22b57b86b6739f2739b5a0f52435596d84d (diff) | |
| download | linux-568cf2e6aa0c762f14d2d0d481a006f93c63ab7a.tar.gz linux-568cf2e6aa0c762f14d2d0d481a006f93c63ab7a.tar.bz2 linux-568cf2e6aa0c762f14d2d0d481a006f93c63ab7a.zip | |
Merge tag 'drm-amdkfd-next-2018-05-28' of git://people.freedesktop.org/~gabbayo/linux into drm-next
- Build amdkfd's related files inside amdgpu only if amdkfd is built
- Fix compile warning
- Print info message in case ASIC is not supported by amdkfd
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180528110435.GA17960@odedg-x270
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h index 12367a9951e8..a8418a3f4e9d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h @@ -156,14 +156,14 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd); /* GPUVM API */ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm, - void **process_info, - struct dma_fence **ef); + void **process_info, + struct dma_fence **ef); int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd, - struct file *filp, - void **vm, void **process_info, - struct dma_fence **ef); + struct file *filp, + void **vm, void **process_info, + struct dma_fence **ef); void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev, - struct amdgpu_vm *vm); + struct amdgpu_vm *vm); void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm); uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *vm); int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( |