From 3fdb6d2e31389db65a71cad25ba907a1306e052b Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 25 Oct 2017 09:41:52 -0700 Subject: gpu: nvgpu: Remove Linux headers from mm_gk20a.h Delte the Linux headers and make some modifications to get rid of the minor compilation issues that resulted. - Add to os_linux.h - Delete #if 0 code that "flushed" a buffer in gr_gk20a.c - Delete FLUSH_CPU_DCACHE() macro - Move the cache flush definitions to and include this header in sim_gk20a.c. This file will not be used by QNX so this should be fine. - Add to gp106/bios_gp106.c and gp106/mclk_gp106.c. - Move function to common/linux/dmabuf.h since it is a dmabuf related function and uses a struct device pointer as an argument. JIRA NVGPU-30 Change-Id: I11f56b98524c7fac3efa91b4686592130e5f8a46 Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1585510 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index 434fc422..183d6211 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h @@ -21,14 +21,10 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ + #ifndef MM_GK20A_H #define MM_GK20A_H -#include -#include -#include -#include - #include #include #include @@ -36,17 +32,6 @@ #include #include -#ifdef CONFIG_ARM64 -#define outer_flush_range(a, b) -#define __cpuc_flush_dcache_area __flush_dcache_area -#endif - -#define FLUSH_CPU_DCACHE(va, pa, size) \ - do { \ - __cpuc_flush_dcache_area((void *)(va), (size_t)(size)); \ - outer_flush_range(pa, pa + (size_t)(size)); \ - } while (0) - struct gpfifo_desc { struct nvgpu_mem mem; u32 entry_num; @@ -198,7 +183,4 @@ void gk20a_mm_init_pdb(struct gk20a *g, struct nvgpu_mem *mem, extern const struct gk20a_mmu_level gk20a_mm_levels_64k[]; extern const struct gk20a_mmu_level gk20a_mm_levels_128k[]; -int gk20a_mm_get_buffer_info(struct device *dev, int dmabuf_fd, - u64 *buffer_id, u64 *buffer_len); - #endif /* MM_GK20A_H */ -- cgit v1.2.2