summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/linux/nvgpu_mem.h4
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/linux/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/linux/nvgpu_mem.h
index 9c52811e..e2d4d336 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/linux/nvgpu_mem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/linux/nvgpu_mem.h
@@ -19,9 +19,11 @@
19 19
20struct page; 20struct page;
21struct sg_table; 21struct sg_table;
22struct scatterlist;
22 23
23struct gk20a; 24struct gk20a;
24struct nvgpu_mem; 25struct nvgpu_mem;
26struct nvgpu_gmmu_attrs;
25 27
26struct nvgpu_mem_priv { 28struct nvgpu_mem_priv {
27 struct page **pages; 29 struct page **pages;
@@ -29,6 +31,8 @@ struct nvgpu_mem_priv {
29 unsigned long flags; 31 unsigned long flags;
30}; 32};
31 33
34u64 nvgpu_mem_get_addr_sgl(struct gk20a *g, struct scatterlist *sgl);
35
32/** 36/**
33 * __nvgpu_mem_create_from_pages - Create an nvgpu_mem from physical pages. 37 * __nvgpu_mem_create_from_pages - Create an nvgpu_mem from physical pages.
34 * 38 *
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
index 4259d40f..63439e6f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
@@ -27,6 +27,7 @@ struct sg_table;
27 27
28struct gk20a; 28struct gk20a;
29struct nvgpu_allocator; 29struct nvgpu_allocator;
30struct nvgpu_gmmu_attrs;
30 31
31/* 32/*
32 * Real location of a buffer - nvgpu_aperture_mask() will deduce what will be 33 * Real location of a buffer - nvgpu_aperture_mask() will deduce what will be
@@ -180,6 +181,8 @@ void nvgpu_mem_wr_n(struct gk20a *g, struct nvgpu_mem *mem, u32 offset,
180void nvgpu_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, 181void nvgpu_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 offset,
181 u32 c, u32 size); 182 u32 c, u32 size);
182 183
184u64 nvgpu_mem_get_addr(struct gk20a *g, struct nvgpu_mem *mem);
185
183u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture, 186u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture,
184 u32 sysmem_mask, u32 vidmem_mask); 187 u32 sysmem_mask, u32 vidmem_mask);
185u32 nvgpu_aperture_mask(struct gk20a *g, struct nvgpu_mem *mem, 188u32 nvgpu_aperture_mask(struct gk20a *g, struct nvgpu_mem *mem,