diff options
author | Sourab Gupta <sourabg@nvidia.com> | 2017-09-25 02:35:17 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-09-26 19:07:25 -0400 |
commit | e794b02d6a3381b1979c0bf8b10f44ba366f06e0 (patch) | |
tree | 978a19afbe399f91a2f5df18238f0ae992ba6a11 /drivers/gpu | |
parent | b351d89e3a0d0ddcb2d1046da9d820a456949952 (diff) |
gpu: nvgpu: use u64 instead of dma_addr_t
The patch modifies a common dma api
(nvgpu_dma_alloc_flags_vid_at) to use u64 argument
(which is OS agnostic) instead of dma_addr_t as
the argument type which is Linux specific.
Change-Id: I74a694b08364b4d9e2826ffaf4620b113604d1cf
Signed-off-by: Sourab Gupta <sourabg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1567709
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/dma.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/dma.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c index 46b49930..67b58016 100644 --- a/drivers/gpu/nvgpu/common/linux/dma.c +++ b/drivers/gpu/nvgpu/common/linux/dma.c | |||
@@ -130,7 +130,7 @@ static void __dma_dbg(struct gk20a *g, size_t size, unsigned long flags, | |||
130 | __dma_dbg_done(g, size, type, "free") | 130 | __dma_dbg_done(g, size, type, "free") |
131 | 131 | ||
132 | #if defined(CONFIG_GK20A_VIDMEM) | 132 | #if defined(CONFIG_GK20A_VIDMEM) |
133 | static u64 __nvgpu_dma_alloc(struct nvgpu_allocator *allocator, dma_addr_t at, | 133 | static u64 __nvgpu_dma_alloc(struct nvgpu_allocator *allocator, u64 at, |
134 | size_t size) | 134 | size_t size) |
135 | { | 135 | { |
136 | u64 addr = 0; | 136 | u64 addr = 0; |
@@ -290,7 +290,7 @@ int nvgpu_dma_alloc_flags_vid(struct gk20a *g, unsigned long flags, | |||
290 | } | 290 | } |
291 | 291 | ||
292 | int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags, | 292 | int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags, |
293 | size_t size, struct nvgpu_mem *mem, dma_addr_t at) | 293 | size_t size, struct nvgpu_mem *mem, u64 at) |
294 | { | 294 | { |
295 | #if defined(CONFIG_GK20A_VIDMEM) | 295 | #if defined(CONFIG_GK20A_VIDMEM) |
296 | u64 addr; | 296 | u64 addr; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/dma.h b/drivers/gpu/nvgpu/include/nvgpu/dma.h index 22b40ac9..50681f8d 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/dma.h +++ b/drivers/gpu/nvgpu/include/nvgpu/dma.h | |||
@@ -172,7 +172,7 @@ int nvgpu_dma_alloc_flags_vid(struct gk20a *g, unsigned long flags, | |||
172 | * %NVGPU_DMA_NO_KERNEL_MAPPING | 172 | * %NVGPU_DMA_NO_KERNEL_MAPPING |
173 | */ | 173 | */ |
174 | int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags, | 174 | int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags, |
175 | size_t size, struct nvgpu_mem *mem, dma_addr_t at); | 175 | size_t size, struct nvgpu_mem *mem, u64 at); |
176 | 176 | ||
177 | /** | 177 | /** |
178 | * nvgpu_dma_free - Free a DMA allocation | 178 | * nvgpu_dma_free - Free a DMA allocation |