diff options
| author | Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com> | 2018-04-10 23:33:04 +0200 |
|---|---|---|
| committer | Oded Gabbay <oded.gabbay@gmail.com> | 2018-04-10 23:33:04 +0200 |
| commit | df03ef9342ce09985210679a734f88a269c19ff5 (patch) | |
| tree | 45b3f87b50f52d8183799877f26a728f26a07125 /drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | |
| parent | drm/amdkfd: Make doorbell size ASIC-dependent (diff) | |
| download | linux-df03ef9342ce09985210679a734f88a269c19ff5.tar.xz linux-df03ef9342ce09985210679a734f88a269c19ff5.zip | |
drm/amdkfd: Clean up KFD_MMAP_ offset handling
Use bit-rotate for better clarity and remove _MASK from the #defines as
these represent mmap types.
Centralize all the parsing of the mmap offset in kfd_mmap and add device
parameter to doorbell and reserved_mem map functions.
Encode gpu_id into upper bits of vm_pgoff. This frees up the lower bits
for encoding the the doorbell ID on Vega10.
Signed-off-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c b/drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c index 484031423d1f..efc59dea563f 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c @@ -126,15 +126,10 @@ void kfd_doorbell_fini(struct kfd_dev *kfd) iounmap(kfd->doorbell_kernel_ptr); } -int kfd_doorbell_mmap(struct kfd_process *process, struct vm_area_struct *vma) +int kfd_doorbell_mmap(struct kfd_dev *dev, struct kfd_process *process, + struct vm_area_struct *vma) { phys_addr_t address; - struct kfd_dev *dev; - - /* Find kfd device according to gpu id */ - dev = kfd_device_by_id(vma->vm_pgoff); - if (!dev) - return -EINVAL; /* * For simplicitly we only allow mapping of the entire doorbell |