diff options
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/vidmem.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vidmem.h b/drivers/gpu/nvgpu/include/nvgpu/vidmem.h index a5d0ae11..1b250f90 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/vidmem.h +++ b/drivers/gpu/nvgpu/include/nvgpu/vidmem.h | |||
@@ -34,7 +34,7 @@ struct gk20a; | |||
34 | struct mm_gk20a; | 34 | struct mm_gk20a; |
35 | struct nvgpu_mem; | 35 | struct nvgpu_mem; |
36 | 36 | ||
37 | struct gk20a_vidmem_buf { | 37 | struct nvgpu_vidmem_buf { |
38 | struct gk20a *g; | 38 | struct gk20a *g; |
39 | struct nvgpu_mem *mem; | 39 | struct nvgpu_mem *mem; |
40 | struct dma_buf *dmabuf; | 40 | struct dma_buf *dmabuf; |
@@ -44,26 +44,26 @@ struct gk20a_vidmem_buf { | |||
44 | 44 | ||
45 | #if defined(CONFIG_GK20A_VIDMEM) | 45 | #if defined(CONFIG_GK20A_VIDMEM) |
46 | 46 | ||
47 | struct nvgpu_page_alloc *get_vidmem_page_alloc(struct scatterlist *sgl); | 47 | struct nvgpu_page_alloc *nvgpu_vidmem_get_page_alloc(struct scatterlist *sgl); |
48 | void set_vidmem_page_alloc(struct scatterlist *sgl, u64 addr); | 48 | void nvgpu_vidmem_set_page_alloc(struct scatterlist *sgl, u64 addr); |
49 | bool is_vidmem_page_alloc(u64 addr); | 49 | bool nvgpu_addr_is_vidmem_page_alloc(u64 addr); |
50 | int gk20a_vidmem_buf_alloc(struct gk20a *g, size_t bytes); | 50 | int nvgpu_vidmem_buf_alloc(struct gk20a *g, size_t bytes); |
51 | int gk20a_vidmem_get_space(struct gk20a *g, u64 *space); | 51 | int nvgpu_vidmem_get_space(struct gk20a *g, u64 *space); |
52 | 52 | ||
53 | struct nvgpu_mem *get_pending_mem_desc(struct mm_gk20a *mm); | 53 | struct nvgpu_mem *nvgpu_vidmem_get_pending_alloc(struct mm_gk20a *mm); |
54 | 54 | ||
55 | void gk20a_vidmem_destroy(struct gk20a *g); | 55 | void nvgpu_vidmem_destroy(struct gk20a *g); |
56 | int gk20a_init_vidmem(struct mm_gk20a *mm); | 56 | int nvgpu_vidmem_init(struct mm_gk20a *mm); |
57 | int gk20a_vidmem_clear_all(struct gk20a *g); | 57 | int nvgpu_vidmem_clear_all(struct gk20a *g); |
58 | 58 | ||
59 | void gk20a_vidmem_clear_mem_worker(struct work_struct *work); | 59 | void nvgpu_vidmem_clear_mem_worker(struct work_struct *work); |
60 | int gk20a_gmmu_clear_vidmem_mem(struct gk20a *g, struct nvgpu_mem *mem); | 60 | int nvgpu_vidmem_clear(struct gk20a *g, struct nvgpu_mem *mem); |
61 | 61 | ||
62 | /* | 62 | /* |
63 | * Will need to be moved later on once we have the Linux vidmem.h file. | 63 | * Will need to be moved later on once we have the Linux vidmem.h file. |
64 | */ | 64 | */ |
65 | struct gk20a *gk20a_vidmem_buf_owner(struct dma_buf *dmabuf); | 65 | struct gk20a *nvgpu_vidmem_buf_owner(struct dma_buf *dmabuf); |
66 | int gk20a_vidbuf_access_memory(struct gk20a *g, struct dma_buf *dmabuf, | 66 | int nvgpu_vidmem_buf_access_memory(struct gk20a *g, struct dma_buf *dmabuf, |
67 | void *buffer, u64 offset, u64 size, u32 cmd); | 67 | void *buffer, u64 offset, u64 size, u32 cmd); |
68 | 68 | ||
69 | #else /* !defined(CONFIG_GK20A_VIDMEM) */ | 69 | #else /* !defined(CONFIG_GK20A_VIDMEM) */ |
@@ -73,60 +73,60 @@ int gk20a_vidbuf_access_memory(struct gk20a *g, struct dma_buf *dmabuf, | |||
73 | */ | 73 | */ |
74 | 74 | ||
75 | static inline struct nvgpu_page_alloc * | 75 | static inline struct nvgpu_page_alloc * |
76 | get_vidmem_page_alloc(struct scatterlist *sgl) | 76 | nvgpu_vidmem_get_page_alloc(struct scatterlist *sgl) |
77 | { | 77 | { |
78 | return NULL; | 78 | return NULL; |
79 | } | 79 | } |
80 | 80 | ||
81 | static inline void set_vidmem_page_alloc(struct scatterlist *sgl, u64 addr) | 81 | static inline void nvgpu_vidmem_set_page_alloc(struct scatterlist *sgl, u64 addr) |
82 | { | 82 | { |
83 | } | 83 | } |
84 | 84 | ||
85 | static inline bool is_vidmem_page_alloc(u64 addr) | 85 | static inline bool nvgpu_addr_is_vidmem_page_alloc(u64 addr) |
86 | { | 86 | { |
87 | return false; | 87 | return false; |
88 | } | 88 | } |
89 | 89 | ||
90 | static inline int gk20a_vidmem_buf_alloc(struct gk20a *g, size_t bytes) | 90 | static inline int nvgpu_vidmem_buf_alloc(struct gk20a *g, size_t bytes) |
91 | { | 91 | { |
92 | return -ENOSYS; | 92 | return -ENOSYS; |
93 | } | 93 | } |
94 | static inline int gk20a_vidmem_get_space(struct gk20a *g, u64 *space) | 94 | static inline int nvgpu_vidmem_get_space(struct gk20a *g, u64 *space) |
95 | { | 95 | { |
96 | return -ENOSYS; | 96 | return -ENOSYS; |
97 | } | 97 | } |
98 | 98 | ||
99 | static inline struct nvgpu_mem *get_pending_mem_desc(struct mm_gk20a *mm) | 99 | static inline struct nvgpu_mem *nvgpu_vidmem_get_pending_alloc(struct mm_gk20a *mm) |
100 | { | 100 | { |
101 | return NULL; | 101 | return NULL; |
102 | } | 102 | } |
103 | 103 | ||
104 | static inline void gk20a_vidmem_destroy(struct gk20a *g) | 104 | static inline void nvgpu_vidmem_destroy(struct gk20a *g) |
105 | { | 105 | { |
106 | } | 106 | } |
107 | 107 | ||
108 | static inline int gk20a_init_vidmem(struct mm_gk20a *mm) | 108 | static inline int nvgpu_vidmem_init(struct mm_gk20a *mm) |
109 | { | 109 | { |
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | 112 | ||
113 | static inline int gk20a_vidmem_clear_all(struct gk20a *g) | 113 | static inline int nvgpu_vidmem_clear_all(struct gk20a *g) |
114 | { | 114 | { |
115 | return -ENOSYS; | 115 | return -ENOSYS; |
116 | } | 116 | } |
117 | 117 | ||
118 | static inline int gk20a_gmmu_clear_vidmem_mem(struct gk20a *g, | 118 | static inline int nvgpu_vidmem_clear(struct gk20a *g, |
119 | struct nvgpu_mem *mem) | 119 | struct nvgpu_mem *mem) |
120 | { | 120 | { |
121 | return -ENOSYS; | 121 | return -ENOSYS; |
122 | } | 122 | } |
123 | 123 | ||
124 | static inline struct gk20a *gk20a_vidmem_buf_owner(struct dma_buf *dmabuf) | 124 | static inline struct gk20a *nvgpu_vidmem_buf_owner(struct dma_buf *dmabuf) |
125 | { | 125 | { |
126 | return NULL; | 126 | return NULL; |
127 | } | 127 | } |
128 | 128 | ||
129 | static inline int gk20a_vidbuf_access_memory(struct gk20a *g, | 129 | static inline int nvgpu_vidmem_buf_access_memory(struct gk20a *g, |
130 | struct dma_buf *dmabuf, | 130 | struct dma_buf *dmabuf, |
131 | void *buffer, u64 offset, | 131 | void *buffer, u64 offset, |
132 | u64 size, u32 cmd) | 132 | u64 size, u32 cmd) |