From 2517d59be282426eec7a97745b76d745ff36c388 Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Tue, 4 Sep 2018 17:39:36 +0530 Subject: gpu: nvgpu: move channel_sync_gk20a.* to common directory 1) Move channel_sync_gk20a.* from gk20a/ to common/ directory as they donot program any hardware registers. Also as an add-on rename channel_sync_gk20a.* to channel_sync.* and update the headers in required files. 2) Rename the struct gk20a_channel_sync to struct nvgpu_channel_sync. Also, corresponding syncpt and semaphore versions of the struct alongwith related methods are renamed by removing "gk20a" from their names and adding "nvgpu". 3) Add misra-c cleanups Jira NVGPU-1086 Change-Id: I4e0e21803ca3858dd7a5fc4d2454dba1f1bfcecd Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/1812594 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h | 112 --------------------------- 1 file changed, 112 deletions(-) delete mode 100644 drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h (limited to 'drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h deleted file mode 100644 index e0e318d2..00000000 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * drivers/video/tegra/host/gk20a/channel_sync_gk20a.h - * - * GK20A Channel Synchronization Abstraction - * - * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef NVGPU_GK20A_CHANNEL_SYNC_GK20A_H -#define NVGPU_GK20A_CHANNEL_SYNC_GK20A_H - -struct gk20a_channel_sync; -struct priv_cmd_entry; -struct channel_gk20a; -struct gk20a_fence; -struct gk20a; -struct nvgpu_semaphore; - -struct gk20a_channel_sync { - nvgpu_atomic_t refcount; - - /* Generate a gpu wait cmdbuf from syncpoint. - * Returns a gpu cmdbuf that performs the wait when executed - */ - int (*wait_syncpt)(struct gk20a_channel_sync *s, u32 id, u32 thresh, - struct priv_cmd_entry *entry); - - /* Generate a gpu wait cmdbuf from sync fd. - * Returns a gpu cmdbuf that performs the wait when executed - */ - int (*wait_fd)(struct gk20a_channel_sync *s, int fd, - struct priv_cmd_entry *entry, int max_wait_cmds); - - /* Increment syncpoint/semaphore. - * Returns - * - a gpu cmdbuf that performs the increment when executed, - * - a fence that can be passed to wait_cpu() and is_expired(). - */ - int (*incr)(struct gk20a_channel_sync *s, - struct priv_cmd_entry *entry, - struct gk20a_fence *fence, - bool need_sync_fence, - bool register_irq); - - /* Increment syncpoint/semaphore, so that the returned fence represents - * work completion (may need wfi) and can be returned to user space. - * Returns - * - a gpu cmdbuf that performs the increment when executed, - * - a fence that can be passed to wait_cpu() and is_expired(), - * - a gk20a_fence that signals when the incr has happened. - */ - int (*incr_user)(struct gk20a_channel_sync *s, - int wait_fence_fd, - struct priv_cmd_entry *entry, - struct gk20a_fence *fence, - bool wfi, - bool need_sync_fence, - bool register_irq); - - /* Reset the channel syncpoint/semaphore. */ - void (*set_min_eq_max)(struct gk20a_channel_sync *s); - - /* - * Set the channel syncpoint/semaphore to safe state - * This should be used to reset User managed syncpoint since we don't - * track threshold values for those syncpoints - */ - void (*set_safe_state)(struct gk20a_channel_sync *s); - - /* Returns the sync point id or negative number if no syncpt*/ - int (*syncpt_id)(struct gk20a_channel_sync *s); - - /* Returns the sync point address of sync point or 0 if not supported */ - u64 (*syncpt_address)(struct gk20a_channel_sync *s); - - /* Free the resources allocated by gk20a_channel_sync_create. */ - void (*destroy)(struct gk20a_channel_sync *s); -}; - -void gk20a_channel_gen_sema_wait_cmd(struct channel_gk20a *c, - struct nvgpu_semaphore *sema, struct priv_cmd_entry *wait_cmd, - u32 wait_cmd_size, int pos); - -int gk20a_channel_gen_syncpt_wait_cmd(struct channel_gk20a *c, - u32 id, u32 thresh, struct priv_cmd_entry *wait_cmd, - u32 wait_cmd_size, int pos, bool preallocated); - -void gk20a_channel_sync_destroy(struct gk20a_channel_sync *sync, - bool set_safe_state); -struct gk20a_channel_sync *gk20a_channel_sync_create(struct channel_gk20a *c, - bool user_managed); -bool gk20a_channel_sync_needs_sync_framework(struct gk20a *g); - -#endif /* NVGPU_GK20A_CHANNEL_SYNC_GK20A_H */ -- cgit v1.2.2