From e794b02d6a3381b1979c0bf8b10f44ba366f06e0 Mon Sep 17 00:00:00 2001 From: Sourab Gupta Date: Mon, 25 Sep 2017 12:05:17 +0530 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1567709 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/dma.c | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/dma.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') 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, __dma_dbg_done(g, size, type, "free") #if defined(CONFIG_GK20A_VIDMEM) -static u64 __nvgpu_dma_alloc(struct nvgpu_allocator *allocator, dma_addr_t at, +static u64 __nvgpu_dma_alloc(struct nvgpu_allocator *allocator, u64 at, size_t size) { u64 addr = 0; @@ -290,7 +290,7 @@ int nvgpu_dma_alloc_flags_vid(struct gk20a *g, unsigned long flags, } int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags, - size_t size, struct nvgpu_mem *mem, dma_addr_t at) + size_t size, struct nvgpu_mem *mem, u64 at) { #if defined(CONFIG_GK20A_VIDMEM) 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, * %NVGPU_DMA_NO_KERNEL_MAPPING */ int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags, - size_t size, struct nvgpu_mem *mem, dma_addr_t at); + size_t size, struct nvgpu_mem *mem, u64 at); /** * nvgpu_dma_free - Free a DMA allocation -- cgit v1.2.2