summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPreetham Chandru R <pchandru@nvidia.com>2019-02-08 14:49:42 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2019-02-14 09:00:16 -0500
commitb5d13e16aeec37281e92111e17be368b406f8511 (patch)
tree61764a990ba43487619c385de0ad02c8a4a9ab9a
parentcbf6394482aa5ac2b774a5d948f870ba1a87d1ef (diff)
gpu: nvgpu: rename dma map/umap interfaces
On Desktop verion, map is called nvidia_p2p_dma_map_pages and umap is called nvidia_p2p_dma_umap_pages. So renamed these two apis to match the desktop version. Bug 200438879 Change-Id: I66301c48b832dfed8c3950678f473c2f82b8761a Signed-off-by: Preetham Chandru R <pchandru@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/2014940 GVS: Gerrit_Virtual_Submit Reviewed-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/os/linux/nvidia_p2p.c10
-rw-r--r--include/linux/nv-p2p.h8
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c b/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c
index 11d27b47..2b0211da 100644
--- a/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c
+++ b/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c
@@ -167,7 +167,7 @@ int nvidia_p2p_free_page_table(struct nvidia_p2p_page_table *page_table)
167} 167}
168EXPORT_SYMBOL(nvidia_p2p_free_page_table); 168EXPORT_SYMBOL(nvidia_p2p_free_page_table);
169 169
170int nvidia_p2p_map_pages(struct device *dev, 170int nvidia_p2p_dma_map_pages(struct device *dev,
171 struct nvidia_p2p_page_table *page_table, 171 struct nvidia_p2p_page_table *page_table,
172 struct nvidia_p2p_dma_mapping **dma_mapping, 172 struct nvidia_p2p_dma_mapping **dma_mapping,
173 enum dma_data_direction direction) 173 enum dma_data_direction direction)
@@ -254,9 +254,9 @@ free_dma_mapping:
254 254
255 return ret; 255 return ret;
256} 256}
257EXPORT_SYMBOL(nvidia_p2p_map_pages); 257EXPORT_SYMBOL(nvidia_p2p_dma_map_pages);
258 258
259int nvidia_p2p_unmap_pages(struct nvidia_p2p_dma_mapping *dma_mapping) 259int nvidia_p2p_dma_unmap_pages(struct nvidia_p2p_dma_mapping *dma_mapping)
260{ 260{
261 struct nvidia_p2p_page_table *page_table = NULL; 261 struct nvidia_p2p_page_table *page_table = NULL;
262 262
@@ -287,10 +287,10 @@ int nvidia_p2p_unmap_pages(struct nvidia_p2p_dma_mapping *dma_mapping)
287 287
288 return 0; 288 return 0;
289} 289}
290EXPORT_SYMBOL(nvidia_p2p_unmap_pages); 290EXPORT_SYMBOL(nvidia_p2p_dma_unmap_pages);
291 291
292int nvidia_p2p_free_dma_mapping(struct nvidia_p2p_dma_mapping *dma_mapping) 292int nvidia_p2p_free_dma_mapping(struct nvidia_p2p_dma_mapping *dma_mapping)
293{ 293{
294 return nvidia_p2p_unmap_pages(dma_mapping); 294 return nvidia_p2p_dma_unmap_pages(dma_mapping);
295} 295}
296EXPORT_SYMBOL(nvidia_p2p_free_dma_mapping); 296EXPORT_SYMBOL(nvidia_p2p_free_dma_mapping);
diff --git a/include/linux/nv-p2p.h b/include/linux/nv-p2p.h
index 40e82796..137519b7 100644
--- a/include/linux/nv-p2p.h
+++ b/include/linux/nv-p2p.h
@@ -159,13 +159,13 @@ int nvidia_p2p_free_page_table(struct nvidia_p2p_page_table *page_table);
159 * 0 upon successful completion. 159 * 0 upon successful completion.
160 * Negative number if any other error 160 * Negative number if any other error
161 */ 161 */
162int nvidia_p2p_map_pages(struct device *dev, 162int nvidia_p2p_dma_map_pages(struct device *dev,
163 struct nvidia_p2p_page_table *page_table, 163 struct nvidia_p2p_page_table *page_table,
164 struct nvidia_p2p_dma_mapping **map, 164 struct nvidia_p2p_dma_mapping **map,
165 enum dma_data_direction direction); 165 enum dma_data_direction direction);
166/* 166/*
167 * @brief 167 * @brief
168 * Unmap the pages previously mapped using nvidia_p2p_map_pages 168 * Unmap the pages previously mapped using nvidia_p2p_dma_map_pages
169 * 169 *
170 * @param[in] *map 170 * @param[in] *map
171 * A pointer to struct nvidia_p2p_dma_mapping. 171 * A pointer to struct nvidia_p2p_dma_mapping.
@@ -175,11 +175,11 @@ int nvidia_p2p_map_pages(struct device *dev,
175 * 0 upon successful completion. 175 * 0 upon successful completion.
176 * Negative number if any other error 176 * Negative number if any other error
177 */ 177 */
178int nvidia_p2p_unmap_pages(struct nvidia_p2p_dma_mapping *map); 178int nvidia_p2p_dma_unmap_pages(struct nvidia_p2p_dma_mapping *map);
179 179
180/* 180/*
181 * @brief 181 * @brief
182 * Unmap the pages previously mapped using nvidia_p2p_map_pages. 182 * Unmap the pages previously mapped using nvidia_p2p_dma_map_pages.
183 * This is called during the execution of the free_callback(). 183 * This is called during the execution of the free_callback().
184 * 184 *
185 * @param[in] *map 185 * @param[in] *map