From 2a2c16af5f9f1ccfc93a13e820d5381e5c881e92 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 18 Apr 2018 12:59:00 -0700 Subject: gpu: nvgpu: Move Linux files away from common Move all Linux source code files to drivers/gpu/nvgpu/os/linux from drivers/gpu/nvgpu/common/linux. This changes the meaning of common to be OS independent. JIRA NVGPU-598 JIRA NVGPU-601 Change-Id: Ib7f2a43d3688bb0d0b7dcc48469a6783fd988ce9 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1747714 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/os_fence_android.c | 79 ----------------------- 1 file changed, 79 deletions(-) delete mode 100644 drivers/gpu/nvgpu/common/linux/os_fence_android.c (limited to 'drivers/gpu/nvgpu/common/linux/os_fence_android.c') diff --git a/drivers/gpu/nvgpu/common/linux/os_fence_android.c b/drivers/gpu/nvgpu/common/linux/os_fence_android.c deleted file mode 100644 index 9be8c6c0..00000000 --- a/drivers/gpu/nvgpu/common/linux/os_fence_android.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include -#include -#include - -#include "gk20a/gk20a.h" - -#include "../drivers/staging/android/sync.h" - -inline struct sync_fence *nvgpu_get_sync_fence(struct nvgpu_os_fence *s) -{ - struct sync_fence *fence = (struct sync_fence *)s->priv; - return fence; -} - -static void nvgpu_os_fence_clear(struct nvgpu_os_fence *fence_out) -{ - fence_out->priv = NULL; - fence_out->g = NULL; - fence_out->ops = NULL; -} - -void nvgpu_os_fence_init(struct nvgpu_os_fence *fence_out, - struct gk20a *g, const struct nvgpu_os_fence_ops *fops, - struct sync_fence *fence) -{ - fence_out->g = g; - fence_out->ops = fops; - fence_out->priv = (void *)fence; -} - -void nvgpu_os_fence_android_drop_ref(struct nvgpu_os_fence *s) -{ - struct sync_fence *fence = nvgpu_get_sync_fence(s); - - sync_fence_put(fence); - - nvgpu_os_fence_clear(s); -} - -void nvgpu_os_fence_android_install_fd(struct nvgpu_os_fence *s, int fd) -{ - struct sync_fence *fence = nvgpu_get_sync_fence(s); - - sync_fence_get(fence); - sync_fence_install(fence, fd); -} - -int nvgpu_os_fence_fdget(struct nvgpu_os_fence *fence_out, - struct channel_gk20a *c, int fd) -{ - int err = -ENOSYS; - -#ifdef CONFIG_TEGRA_GK20A_NVHOST - err = nvgpu_os_fence_syncpt_fdget(fence_out, c, fd); -#endif - - if (err) - err = nvgpu_os_fence_sema_fdget(fence_out, c, fd); - - if (err) - nvgpu_err(c->g, "error obtaining fence from fd %d", fd); - - return err; -} -- cgit v1.2.2