From 26783b85bfee4c2ef4f2ccc2d16ebc783dd0aa7d Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 2 Jul 2018 10:44:05 -0700 Subject: gpu: nvpgu: Rename Linux specific vidmem code Rename os/linux/vidmem.c to os/linux/dmabuf_vidmem.c. The code is mainly dealing with interfacing with Linux dmabuf framework and its responsibilities got confused with common/mm/vidmem.c. Also move the header include/nvgpu/linux/vidmem.h to os/linux/dmabuf_vidmem.h. It does not expose any interface to outside Linux code. Change-Id: I2cb1057a8934d5cb5c5860023aa12f8f048a6684 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1768261 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/linux/vidmem.h | 77 -------------------------- 1 file changed, 77 deletions(-) delete mode 100644 drivers/gpu/nvgpu/include/nvgpu/linux/vidmem.h (limited to 'drivers/gpu/nvgpu/include') diff --git a/drivers/gpu/nvgpu/include/nvgpu/linux/vidmem.h b/drivers/gpu/nvgpu/include/nvgpu/linux/vidmem.h deleted file mode 100644 index ec02faec..00000000 --- a/drivers/gpu/nvgpu/include/nvgpu/linux/vidmem.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2017, 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 . - */ - -#ifndef __NVGPU_LINUX_VIDMEM_H__ -#define __NVGPU_LINUX_VIDMEM_H__ - -#include - -struct dma_buf; - -struct gk20a; - -#ifdef CONFIG_GK20A_VIDMEM - -struct gk20a *nvgpu_vidmem_buf_owner(struct dma_buf *dmabuf); -int nvgpu_vidmem_export_linux(struct gk20a *g, size_t bytes); - -void nvgpu_vidmem_set_page_alloc(struct scatterlist *sgl, u64 addr); -struct nvgpu_page_alloc *nvgpu_vidmem_get_page_alloc(struct scatterlist *sgl); - -int nvgpu_vidmem_buf_access_memory(struct gk20a *g, struct dma_buf *dmabuf, - void *buffer, u64 offset, u64 size, u32 cmd); - -#else /* !CONFIG_GK20A_VIDMEM */ - -static inline struct gk20a *nvgpu_vidmem_buf_owner(struct dma_buf *dmabuf) -{ - return NULL; -} - -static inline int nvgpu_vidmem_export_linux(struct gk20a *g, size_t bytes) -{ - return -ENOSYS; -} - -static inline void nvgpu_vidmem_set_page_alloc(struct scatterlist *sgl, - u64 addr) -{ -} - -static inline struct nvgpu_page_alloc *nvgpu_vidmem_get_page_alloc( - struct scatterlist *sgl) -{ - return NULL; -} - -static inline int nvgpu_vidmem_buf_access_memory(struct gk20a *g, - struct dma_buf *dmabuf, - void *buffer, u64 offset, - u64 size, u32 cmd) -{ - return -ENOSYS; -} - -#endif - - -struct nvgpu_vidmem_linux { - struct dma_buf *dmabuf; - void *dmabuf_priv; - void (*dmabuf_priv_delete)(void *); -}; - -#endif -- cgit v1.2.2