From 776077fe653b961a2f78bcbaa5bfbbd70358a8a1 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Tue, 15 Jan 2019 16:21:31 -0500 Subject: [PATCH] libhsakmt: Use a better name doorbell_mmap_offset The previous name doorbell_offset is used too extensively throughout the code and did not reflect the true usage. Change-Id: I50d33f5c00e82c46cdf4264a78b8f925705bed6a Signed-off-by: Yong Zhao --- src/fmm.c | 4 ++-- src/queues.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/fmm.c b/src/fmm.c index 0db7759b84..8c2b530649 100644 --- a/src/fmm.c +++ b/src/fmm.c @@ -1369,7 +1369,7 @@ void *fmm_allocate_device(uint32_t gpu_id, void *address, uint64_t MemorySizeInB } void *fmm_allocate_doorbell(uint32_t gpu_id, uint64_t MemorySizeInBytes, - uint64_t doorbell_offset) + uint64_t doorbell_mmap_offset) { manageable_aperture_t *aperture; int32_t gpu_mem_id; @@ -1410,7 +1410,7 @@ void *fmm_allocate_doorbell(uint32_t gpu_id, uint64_t MemorySizeInBytes, void *ret = mmap(mem, MemorySizeInBytes, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, kfd_fd, - doorbell_offset); + doorbell_mmap_offset); if (ret == MAP_FAILED) { __fmm_release(vm_obj, aperture); return NULL; diff --git a/src/queues.c b/src/queues.c index d3fd0602ab..98869c57ac 100644 --- a/src/queues.c +++ b/src/queues.c @@ -263,12 +263,12 @@ void clear_process_doorbells(void) } static HSAKMT_STATUS map_doorbell_apu(HSAuint32 NodeId, HSAuint32 gpu_id, - HSAuint64 doorbell_offset) + HSAuint64 doorbell_mmap_offset) { void *ptr; ptr = mmap(0, doorbells[NodeId].size, PROT_READ|PROT_WRITE, - MAP_SHARED, kfd_fd, doorbell_offset); + MAP_SHARED, kfd_fd, doorbell_mmap_offset); if (ptr == MAP_FAILED) return HSAKMT_STATUS_ERROR; @@ -279,12 +279,12 @@ static HSAKMT_STATUS map_doorbell_apu(HSAuint32 NodeId, HSAuint32 gpu_id, } static HSAKMT_STATUS map_doorbell_dgpu(HSAuint32 NodeId, HSAuint32 gpu_id, - HSAuint64 doorbell_offset) + HSAuint64 doorbell_mmap_offset) { void *ptr; ptr = fmm_allocate_doorbell(gpu_id, doorbells[NodeId].size, - doorbell_offset); + doorbell_mmap_offset); if (!ptr) return HSAKMT_STATUS_ERROR; @@ -301,7 +301,7 @@ static HSAKMT_STATUS map_doorbell_dgpu(HSAuint32 NodeId, HSAuint32 gpu_id, } static HSAKMT_STATUS map_doorbell(HSAuint32 NodeId, HSAuint32 gpu_id, - HSAuint64 doorbell_offset) + HSAuint64 doorbell_mmap_offset) { HSAKMT_STATUS status = HSAKMT_STATUS_SUCCESS; @@ -315,16 +315,16 @@ static HSAKMT_STATUS map_doorbell(HSAuint32 NodeId, HSAuint32 gpu_id, &doorbells[NodeId]); if (doorbells[NodeId].use_gpuvm) { - status = map_doorbell_dgpu(NodeId, gpu_id, doorbell_offset); + status = map_doorbell_dgpu(NodeId, gpu_id, doorbell_mmap_offset); if (status != HSAKMT_STATUS_SUCCESS) { /* Fall back to the old method if KFD doesn't * support doorbells in GPUVM */ doorbells[NodeId].use_gpuvm = false; - status = map_doorbell_apu(NodeId, gpu_id, doorbell_offset); + status = map_doorbell_apu(NodeId, gpu_id, doorbell_mmap_offset); } } else - status = map_doorbell_apu(NodeId, gpu_id, doorbell_offset); + status = map_doorbell_apu(NodeId, gpu_id, doorbell_mmap_offset); if (status != HSAKMT_STATUS_SUCCESS) doorbells[NodeId].size = 0;