From 4f40637c580c5f25f34f45c2c16b5332104897bc Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Tue, 24 Apr 2018 10:38:30 +0530 Subject: gpu: nvgpu: remove sync_fence dependencies from fence_gk20a Replaced all instances of sync_fence in gk20a_fence* code with nvgpu_os_fence. Added the API install_fence for the nvgpu_os_fence abstraction. sync_fence mechanism and its dependencies are completely removed from the fence_gk20a methods. Due to the recent os_fence changes and the changes to fence_gk20a, we can finally get rid of all the CONFIG_SYNCS present in the submit path. JIRA NVGPU-66 Change-Id: I3551dab04b93b1e94db83fc102a41872be89e9ed Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/1701245 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fence_gk20a.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/fence_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h index 6a28e657..271b2a18 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h @@ -28,13 +28,13 @@ #include #include +#include struct platform_device; -struct sync_timeline; -struct sync_fence; struct nvgpu_semaphore; struct channel_gk20a; struct gk20a; +struct nvgpu_os_fence; struct gk20a_fence_ops; @@ -46,7 +46,7 @@ struct gk20a_fence { struct nvgpu_ref ref; const struct gk20a_fence_ops *ops; - struct sync_fence *os_fence; + struct nvgpu_os_fence os_fence; /* Valid for fences created from semaphores: */ struct nvgpu_semaphore *semaphore; @@ -66,13 +66,13 @@ int gk20a_fence_from_semaphore( struct gk20a_fence *fence_out, struct nvgpu_semaphore *semaphore, struct nvgpu_cond *semaphore_wq, - struct sync_fence *os_fence); + struct nvgpu_os_fence os_fence); int gk20a_fence_from_syncpt( struct gk20a_fence *fence_out, struct nvgpu_nvhost_dev *nvhost_dev, u32 id, u32 value, - struct sync_fence *os_fence); + struct nvgpu_os_fence os_fence); int gk20a_alloc_fence_pool( struct channel_gk20a *c, @@ -86,7 +86,7 @@ struct gk20a_fence *gk20a_alloc_fence( void gk20a_init_fence(struct gk20a_fence *f, const struct gk20a_fence_ops *ops, - struct sync_fence *os_fence); + struct nvgpu_os_fence os_fence); /* Fence operations */ void gk20a_fence_put(struct gk20a_fence *f); -- cgit v1.2.2