From b3446bc0b6fca6cb992667f80a95f8503b6a652a Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Thu, 7 Sep 2017 15:27:55 -0700 Subject: gpu: nvgpu: Move dma_buf usage from mm_gk20a.c Move most of the dma_buf usage present in the mm_gk20a.c code out to Linux specific code and some commom/mm code. There's two primary groups of code: 1. dma_buf priv field code (for holding comptag data) 2. Comptag usage that relies on dma_buf pointers For (1) the dma_buf code was simply moved to common/linux/dmabuf.c since most of this code is clearly Linux specific. The comptag code was a bit more complicated since there is two parts to the comptag code. Firstly there's the code that manages the comptag memory. This is essentially a simple allocator. This was moved to common/mm/comptags.c since it can be shared across all chips. The second set of code is moved to common/linux/comptags.c since it is the interface between dma_bufs and the comptag memory. Two other fixes were done as well: - Add struct gk20a to the comptag allocator init so that the proper nvgpu_vzalloc() function could be used. - Add necessary includes to common/linux/vm_priv.h. JIRA NVGPU-30 JIRA NVGPU-138 Change-Id: I96c57f2763e5ebe18a2f2ee4b33e0e1a2597848c Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1566628 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/comptags.h | 57 ++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 drivers/gpu/nvgpu/include/nvgpu/comptags.h (limited to 'drivers/gpu/nvgpu/include') diff --git a/drivers/gpu/nvgpu/include/nvgpu/comptags.h b/drivers/gpu/nvgpu/include/nvgpu/comptags.h new file mode 100644 index 00000000..6e3062ec --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/comptags.h @@ -0,0 +1,57 @@ +/* +* 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_COMPTAGS__ +#define __NVGPU_COMPTAGS__ + +#include + +struct gk20a; + +struct gk20a_comptags { + u32 offset; + u32 lines; + u32 allocated_lines; + bool user_mappable; +}; + +struct gk20a_comptag_allocator { + struct gk20a *g; + + struct nvgpu_mutex lock; + + /* This bitmap starts at ctag 1. 0th cannot be taken. */ + unsigned long *bitmap; + + /* Size of bitmap, not max ctags, so one less. */ + unsigned long size; +}; + +/* real size here, but first (ctag 0) isn't used */ +int gk20a_comptag_allocator_init(struct gk20a *g, + struct gk20a_comptag_allocator *allocator, + unsigned long size); +void gk20a_comptag_allocator_destroy(struct gk20a *g, + struct gk20a_comptag_allocator *allocator); + +int gk20a_comptaglines_alloc(struct gk20a_comptag_allocator *allocator, + u32 *offset, u32 len); +void gk20a_comptaglines_free(struct gk20a_comptag_allocator *allocator, + u32 offset, u32 len); + + + +#endif -- cgit v1.2.2