diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/dma.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/nvgpu_mem.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/vidmem.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pramin.c | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c index ca657da2..b62c4593 100644 --- a/drivers/gpu/nvgpu/common/linux/dma.c +++ b/drivers/gpu/nvgpu/common/linux/dma.c | |||
@@ -28,9 +28,11 @@ | |||
28 | #include <nvgpu/vidmem.h> | 28 | #include <nvgpu/vidmem.h> |
29 | 29 | ||
30 | #include <nvgpu/linux/dma.h> | 30 | #include <nvgpu/linux/dma.h> |
31 | #include <nvgpu/linux/vidmem.h> | ||
31 | 32 | ||
32 | #include "gk20a/gk20a.h" | 33 | #include "gk20a/gk20a.h" |
33 | #include "gk20a/platform_gk20a.h" | 34 | #include "gk20a/platform_gk20a.h" |
35 | |||
34 | #include "os_linux.h" | 36 | #include "os_linux.h" |
35 | 37 | ||
36 | /* | 38 | /* |
@@ -348,6 +350,7 @@ int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags, | |||
348 | 350 | ||
349 | mem->aligned_size = size; | 351 | mem->aligned_size = size; |
350 | mem->aperture = APERTURE_VIDMEM; | 352 | mem->aperture = APERTURE_VIDMEM; |
353 | mem->vidmem_alloc = (struct nvgpu_page_alloc *)(uintptr_t)addr; | ||
351 | mem->allocator = vidmem_alloc; | 354 | mem->allocator = vidmem_alloc; |
352 | mem->priv.flags = flags; | 355 | mem->priv.flags = flags; |
353 | 356 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c index e1f8a598..8740ac3d 100644 --- a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/vidmem.h> | 25 | #include <nvgpu/vidmem.h> |
26 | 26 | ||
27 | #include <nvgpu/linux/dma.h> | 27 | #include <nvgpu/linux/dma.h> |
28 | #include <nvgpu/linux/vidmem.h> | ||
28 | 29 | ||
29 | #include "os_linux.h" | 30 | #include "os_linux.h" |
30 | 31 | ||
@@ -355,7 +356,7 @@ u64 nvgpu_mem_get_addr(struct gk20a *g, struct nvgpu_mem *mem) | |||
355 | /* | 356 | /* |
356 | * Otherwise get the vidmem address. | 357 | * Otherwise get the vidmem address. |
357 | */ | 358 | */ |
358 | alloc = nvgpu_vidmem_get_page_alloc(mem->priv.sgt->sgl); | 359 | alloc = mem->vidmem_alloc; |
359 | 360 | ||
360 | /* This API should not be used with > 1 chunks */ | 361 | /* This API should not be used with > 1 chunks */ |
361 | WARN_ON(alloc->nr_chunks != 1); | 362 | WARN_ON(alloc->nr_chunks != 1); |
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c index 18f46c03..d1c5a2e8 100644 --- a/drivers/gpu/nvgpu/common/mm/vidmem.c +++ b/drivers/gpu/nvgpu/common/mm/vidmem.c | |||
@@ -195,7 +195,7 @@ int nvgpu_vidmem_clear(struct gk20a *g, struct nvgpu_mem *mem) | |||
195 | if (g->mm.vidmem.ce_ctx_id == (u32)~0) | 195 | if (g->mm.vidmem.ce_ctx_id == (u32)~0) |
196 | return -EINVAL; | 196 | return -EINVAL; |
197 | 197 | ||
198 | alloc = nvgpu_vidmem_get_page_alloc(mem->priv.sgt->sgl); | 198 | alloc = mem->vidmem_alloc; |
199 | 199 | ||
200 | nvgpu_sgt_for_each_sgl(sgl, &alloc->sgt) { | 200 | nvgpu_sgt_for_each_sgl(sgl, &alloc->sgt) { |
201 | if (gk20a_last_fence) | 201 | if (gk20a_last_fence) |
diff --git a/drivers/gpu/nvgpu/common/pramin.c b/drivers/gpu/nvgpu/common/pramin.c index b7bc7439..b6166f51 100644 --- a/drivers/gpu/nvgpu/common/pramin.c +++ b/drivers/gpu/nvgpu/common/pramin.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <nvgpu/pramin.h> | 23 | #include <nvgpu/pramin.h> |
24 | #include <nvgpu/page_allocator.h> | 24 | #include <nvgpu/page_allocator.h> |
25 | #include <nvgpu/enabled.h> | 25 | #include <nvgpu/enabled.h> |
26 | #include <nvgpu/vidmem.h> | ||
27 | 26 | ||
28 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
29 | 28 | ||
@@ -55,7 +54,7 @@ void nvgpu_pramin_access_batched(struct gk20a *g, struct nvgpu_mem *mem, | |||
55 | if (!g->regs && nvgpu_is_enabled(g, NVGPU_DRIVER_IS_DYING)) | 54 | if (!g->regs && nvgpu_is_enabled(g, NVGPU_DRIVER_IS_DYING)) |
56 | return; | 55 | return; |
57 | 56 | ||
58 | alloc = nvgpu_vidmem_get_page_alloc(mem->priv.sgt->sgl); | 57 | alloc = mem->vidmem_alloc; |
59 | sgt = &alloc->sgt; | 58 | sgt = &alloc->sgt; |
60 | 59 | ||
61 | nvgpu_sgt_for_each_sgl(sgl, sgt) { | 60 | nvgpu_sgt_for_each_sgl(sgl, sgt) { |