nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 09:57:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: posix: Use nvgpu_mem_sgl for SGLs

Browse Source 
Initially, SGL functions were using nvgpu_mem behind the scenes
which is inconvenient to actually use as a list. Instead, this
patch uses the nvgpu_mem_sgl.

JIRA NVGPU-1280

Change-Id: I251bf25e6133ac0d4ff8e44d86f634383978ea9a
Signed-off-by: Nicolas Benech <nbenech@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1923712
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Philip Elcan <pelcan@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Nicolas Benech
2018-10-10 11:52:01 -04:00
committed by mobile promotions
parent 44d3ef0ca2
commit 0e367046e9
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/gpu/nvgpu/os/posix/posix-nvgpu_mem.c
View File

@@ -25,6 +25,9 @@
#include <nvgpu/gmmu.h> #include <nvgpu/gmmu.h>
#include <nvgpu/kmem.h> #include <nvgpu/kmem.h>
#include <nvgpu/nvgpu_mem.h> #include <nvgpu/nvgpu_mem.h>
#include <nvgpu/gk20a.h>
#define DMA_ERROR_CODE (~(u64)0x0)
/* /*
* These functions are somewhat meaningless. * These functions are somewhat meaningless.
@@ -41,36 +44,46 @@ u64 nvgpu_mem_get_phys_addr(struct gk20a *g, struct nvgpu_mem *mem)
static struct nvgpu_sgl *nvgpu_mem_sgl_next(struct nvgpu_sgl *sgl) static struct nvgpu_sgl *nvgpu_mem_sgl_next(struct nvgpu_sgl *sgl)
{ {
return NULL; struct nvgpu_mem_sgl *mem = (struct nvgpu_mem_sgl *)sgl;
return (struct nvgpu_sgl *) mem->next;
} }
static u64 nvgpu_mem_sgl_phys(struct gk20a *g, struct nvgpu_sgl *sgl) static u64 nvgpu_mem_sgl_phys(struct gk20a *g, struct nvgpu_sgl *sgl)
{ {
struct nvgpu_mem *mem = (struct nvgpu_mem *)sgl; struct nvgpu_mem_sgl *mem = (struct nvgpu_mem_sgl *)sgl;
return (u64)(uintptr_t)mem->cpu_va; return (u64)(uintptr_t)mem->phys;
} }
static u64 nvgpu_mem_sgl_dma(struct nvgpu_sgl *sgl) static u64 nvgpu_mem_sgl_dma(struct nvgpu_sgl *sgl)
{ {
struct nvgpu_mem *mem = (struct nvgpu_mem *)sgl; struct nvgpu_mem_sgl *mem = (struct nvgpu_mem_sgl *)sgl;
return (u64)(uintptr_t)mem->cpu_va; return (u64)(uintptr_t)mem->dma;
} }
static u64 nvgpu_mem_sgl_length(struct nvgpu_sgl *sgl) static u64 nvgpu_mem_sgl_length(struct nvgpu_sgl *sgl)
{ {
struct nvgpu_mem *mem = (struct nvgpu_mem *)sgl; struct nvgpu_mem_sgl *mem = (struct nvgpu_mem_sgl *)sgl;
return (u64)mem->aligned_size; return (u64)mem->length;
} }
static u64 nvgpu_mem_sgl_gpu_addr(struct gk20a *g, struct nvgpu_sgl *sgl, static u64 nvgpu_mem_sgl_gpu_addr(struct gk20a *g, struct nvgpu_sgl *sgl,
struct nvgpu_gmmu_attrs *attrs) struct nvgpu_gmmu_attrs *attrs)
{ {
struct nvgpu_mem *mem = (struct nvgpu_mem *)sgl; struct nvgpu_mem_sgl *mem = (struct nvgpu_mem_sgl *)sgl;
return mem->gpu_va; if (mem->dma == 0U) {
return g->ops.mm.gpu_phys_addr(g, attrs, mem->phys);
}
if (mem->dma == DMA_ERROR_CODE) {
return 0x0;
}
return nvgpu_mem_iommu_translate(g, mem->dma);
} }
static bool nvgpu_mem_sgt_iommuable(struct gk20a *g, struct nvgpu_sgt *sgt) static bool nvgpu_mem_sgt_iommuable(struct gk20a *g, struct nvgpu_sgt *sgt)