diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pramin_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pramin_gk20a.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pramin_gk20a.c b/drivers/gpu/nvgpu/gk20a/pramin_gk20a.c index 8a34a63c..aaba4ffc 100644 --- a/drivers/gpu/nvgpu/gk20a/pramin_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pramin_gk20a.c | |||
@@ -26,9 +26,9 @@ | |||
26 | 26 | ||
27 | /* WARNING: returns pramin_window_lock taken, complement with pramin_exit() */ | 27 | /* WARNING: returns pramin_window_lock taken, complement with pramin_exit() */ |
28 | u32 gk20a_pramin_enter(struct gk20a *g, struct nvgpu_mem *mem, | 28 | u32 gk20a_pramin_enter(struct gk20a *g, struct nvgpu_mem *mem, |
29 | struct nvgpu_mem_sgl *sgl, u32 w) | 29 | struct nvgpu_sgt *sgt, void *sgl, u32 w) |
30 | { | 30 | { |
31 | u64 bufbase = nvgpu_mem_sgl_phys(sgl); | 31 | u64 bufbase = nvgpu_sgt_get_phys(sgt, sgl); |
32 | u64 addr = bufbase + w * sizeof(u32); | 32 | u64 addr = bufbase + w * sizeof(u32); |
33 | u32 hi = (u32)((addr & ~(u64)0xfffff) | 33 | u32 hi = (u32)((addr & ~(u64)0xfffff) |
34 | >> bus_bar0_window_target_bar0_window_base_shift_v()); | 34 | >> bus_bar0_window_target_bar0_window_base_shift_v()); |
@@ -41,8 +41,8 @@ u32 gk20a_pramin_enter(struct gk20a *g, struct nvgpu_mem *mem, | |||
41 | gk20a_dbg(gpu_dbg_mem, | 41 | gk20a_dbg(gpu_dbg_mem, |
42 | "0x%08x:%08x begin for %p,%p at [%llx,%llx] (sz %llx)", | 42 | "0x%08x:%08x begin for %p,%p at [%llx,%llx] (sz %llx)", |
43 | hi, lo, mem, sgl, bufbase, | 43 | hi, lo, mem, sgl, bufbase, |
44 | bufbase + nvgpu_mem_sgl_phys(sgl), | 44 | bufbase + nvgpu_sgt_get_phys(sgt, sgl), |
45 | nvgpu_mem_sgl_length(sgl)); | 45 | nvgpu_sgt_get_length(sgt, sgl)); |
46 | 46 | ||
47 | WARN_ON(!bufbase); | 47 | WARN_ON(!bufbase); |
48 | 48 | ||
@@ -58,7 +58,7 @@ u32 gk20a_pramin_enter(struct gk20a *g, struct nvgpu_mem *mem, | |||
58 | } | 58 | } |
59 | 59 | ||
60 | void gk20a_pramin_exit(struct gk20a *g, struct nvgpu_mem *mem, | 60 | void gk20a_pramin_exit(struct gk20a *g, struct nvgpu_mem *mem, |
61 | struct nvgpu_mem_sgl *sgl) | 61 | void *sgl) |
62 | { | 62 | { |
63 | gk20a_dbg(gpu_dbg_mem, "end for %p,%p", mem, sgl); | 63 | gk20a_dbg(gpu_dbg_mem, "end for %p,%p", mem, sgl); |
64 | 64 | ||