From abec0ddc19b89822138f3c8970516eed4d0e17d9 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Wed, 18 May 2016 14:19:53 +0300 Subject: gpu: nvgpu: use mem_desc for semaphores Replace manual buffer allocation and cpu_va pointer accesses with gk20a_gmmu_{alloc,free}() and gk20a_mem_{rd,wr}() using a struct mem_desc in gk20a_semaphore_pool, for buffer aperture flexibility. JIRA DNVGPU-23 Change-Id: I394c38f407a9da02480bfd35062a892eec242ea3 Signed-off-by: Konsta Holtta Reviewed-on: http://git-master/r/1146684 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/fence_gk20a.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/fence_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c index 1bda5902..fe38ae57 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c @@ -154,17 +154,9 @@ struct gk20a_fence *gk20a_fence_from_semaphore( struct sync_fence *sync_fence = NULL; #ifdef CONFIG_SYNC -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) sync_fence = gk20a_sync_fence_create(timeline, semaphore, - dependency, "f-gk20a-0x%04llx", - ((uintptr_t)(void *)semaphore->value) & - 0xffff); -#else - sync_fence = gk20a_sync_fence_create(timeline, semaphore, - dependency, "f-gk20a-0x%04llx", - ((u64)(void *)semaphore->value) & - 0xffff); -#endif + dependency, "f-gk20a-0x%04x", + semaphore->offset & 0xffff); if (!sync_fence) return NULL; #endif -- cgit v1.2.2