diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/mm_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index dd56a6f9..30d695ff 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -112,7 +112,7 @@ static int channel_gv11b_setup_ramfc(struct channel_gk20a *c, | |||
112 | unsigned long acquire_timeout, u32 flags) | 112 | unsigned long acquire_timeout, u32 flags) |
113 | { | 113 | { |
114 | struct gk20a *g = c->g; | 114 | struct gk20a *g = c->g; |
115 | struct mem_desc *mem = &c->inst_block; | 115 | struct nvgpu_mem *mem = &c->inst_block; |
116 | u32 data; | 116 | u32 data; |
117 | 117 | ||
118 | gk20a_dbg_fn(""); | 118 | gk20a_dbg_fn(""); |
@@ -193,7 +193,7 @@ static void gv11b_ring_channel_doorbell(struct channel_gk20a *c) | |||
193 | 193 | ||
194 | static u32 gv11b_userd_gp_get(struct gk20a *g, struct channel_gk20a *c) | 194 | static u32 gv11b_userd_gp_get(struct gk20a *g, struct channel_gk20a *c) |
195 | { | 195 | { |
196 | struct mem_desc *userd_mem = &g->fifo.userd; | 196 | struct nvgpu_mem *userd_mem = &g->fifo.userd; |
197 | u32 offset = c->hw_chid * (g->fifo.userd_entry_size / sizeof(u32)); | 197 | u32 offset = c->hw_chid * (g->fifo.userd_entry_size / sizeof(u32)); |
198 | 198 | ||
199 | return nvgpu_mem_rd32(g, userd_mem, | 199 | return nvgpu_mem_rd32(g, userd_mem, |
@@ -202,7 +202,7 @@ static u32 gv11b_userd_gp_get(struct gk20a *g, struct channel_gk20a *c) | |||
202 | 202 | ||
203 | static void gv11b_userd_gp_put(struct gk20a *g, struct channel_gk20a *c) | 203 | static void gv11b_userd_gp_put(struct gk20a *g, struct channel_gk20a *c) |
204 | { | 204 | { |
205 | struct mem_desc *userd_mem = &g->fifo.userd; | 205 | struct nvgpu_mem *userd_mem = &g->fifo.userd; |
206 | u32 offset = c->hw_chid * (g->fifo.userd_entry_size / sizeof(u32)); | 206 | u32 offset = c->hw_chid * (g->fifo.userd_entry_size / sizeof(u32)); |
207 | 207 | ||
208 | nvgpu_mem_wr32(g, userd_mem, offset + ram_userd_gp_put_w(), | 208 | nvgpu_mem_wr32(g, userd_mem, offset + ram_userd_gp_put_w(), |
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index ddaaa350..6e6b5630 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -642,7 +642,7 @@ static int gr_gv11b_init_ctx_state(struct gk20a *g) | |||
642 | } | 642 | } |
643 | 643 | ||
644 | int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size, | 644 | int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size, |
645 | struct mem_desc *mem) | 645 | struct nvgpu_mem *mem) |
646 | { | 646 | { |
647 | int err; | 647 | int err; |
648 | 648 | ||
@@ -778,7 +778,7 @@ fail_free_gk20a_ctx: | |||
778 | static void dump_ctx_switch_stats(struct gk20a *g, struct vm_gk20a *vm, | 778 | static void dump_ctx_switch_stats(struct gk20a *g, struct vm_gk20a *vm, |
779 | struct gr_ctx_desc *gr_ctx) | 779 | struct gr_ctx_desc *gr_ctx) |
780 | { | 780 | { |
781 | struct mem_desc *mem = &gr_ctx->mem; | 781 | struct nvgpu_mem *mem = &gr_ctx->mem; |
782 | 782 | ||
783 | if (nvgpu_mem_begin(g, mem)) { | 783 | if (nvgpu_mem_begin(g, mem)) { |
784 | WARN_ON("Cannot map context"); | 784 | WARN_ON("Cannot map context"); |
@@ -834,7 +834,7 @@ static void gr_gv11b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm, | |||
834 | 834 | ||
835 | static void gr_gv11b_update_ctxsw_preemption_mode(struct gk20a *g, | 835 | static void gr_gv11b_update_ctxsw_preemption_mode(struct gk20a *g, |
836 | struct channel_ctx_gk20a *ch_ctx, | 836 | struct channel_ctx_gk20a *ch_ctx, |
837 | struct mem_desc *mem) | 837 | struct nvgpu_mem *mem) |
838 | { | 838 | { |
839 | struct gr_ctx_desc *gr_ctx = ch_ctx->gr_ctx; | 839 | struct gr_ctx_desc *gr_ctx = ch_ctx->gr_ctx; |
840 | u32 gfxp_preempt_option = | 840 | u32 gfxp_preempt_option = |
@@ -1925,7 +1925,7 @@ static int gr_gv11b_commit_global_timeslice(struct gk20a *g, | |||
1925 | } | 1925 | } |
1926 | 1926 | ||
1927 | static void gv11b_restore_context_header(struct gk20a *g, | 1927 | static void gv11b_restore_context_header(struct gk20a *g, |
1928 | struct mem_desc *ctxheader) | 1928 | struct nvgpu_mem *ctxheader) |
1929 | { | 1929 | { |
1930 | u32 va_lo, va_hi; | 1930 | u32 va_lo, va_hi; |
1931 | struct gr_gk20a *gr = &g->gr; | 1931 | struct gr_gk20a *gr = &g->gr; |
@@ -1947,7 +1947,7 @@ static void gv11b_restore_context_header(struct gk20a *g, | |||
1947 | ctxsw_prog_main_image_num_save_ops_o(), 0); | 1947 | ctxsw_prog_main_image_num_save_ops_o(), 0); |
1948 | } | 1948 | } |
1949 | static void gr_gv11b_write_zcull_ptr(struct gk20a *g, | 1949 | static void gr_gv11b_write_zcull_ptr(struct gk20a *g, |
1950 | struct mem_desc *mem, u64 gpu_va) | 1950 | struct nvgpu_mem *mem, u64 gpu_va) |
1951 | { | 1951 | { |
1952 | u32 va_lo, va_hi; | 1952 | u32 va_lo, va_hi; |
1953 | 1953 | ||
@@ -1962,7 +1962,7 @@ static void gr_gv11b_write_zcull_ptr(struct gk20a *g, | |||
1962 | 1962 | ||
1963 | 1963 | ||
1964 | static void gr_gv11b_write_pm_ptr(struct gk20a *g, | 1964 | static void gr_gv11b_write_pm_ptr(struct gk20a *g, |
1965 | struct mem_desc *mem, u64 gpu_va) | 1965 | struct nvgpu_mem *mem, u64 gpu_va) |
1966 | { | 1966 | { |
1967 | u32 va_lo, va_hi; | 1967 | u32 va_lo, va_hi; |
1968 | 1968 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h index 7467fea8..9d9f969d 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h | |||
@@ -44,7 +44,7 @@ enum { | |||
44 | 44 | ||
45 | void gv11b_init_gr(struct gpu_ops *ops); | 45 | void gv11b_init_gr(struct gpu_ops *ops); |
46 | int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size, | 46 | int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size, |
47 | struct mem_desc *mem); | 47 | struct nvgpu_mem *mem); |
48 | /*zcull*/ | 48 | /*zcull*/ |
49 | void gr_gv11b_program_zcull_mapping(struct gk20a *g, u32 zcull_num_entries, | 49 | void gr_gv11b_program_zcull_mapping(struct gk20a *g, u32 zcull_num_entries, |
50 | u32 *zcull_map_tiles); | 50 | u32 *zcull_map_tiles); |
diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c index 84a9449a..269108ff 100644 --- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c | |||
@@ -28,7 +28,7 @@ static bool gv11b_mm_is_bar1_supported(struct gk20a *g) | |||
28 | return false; | 28 | return false; |
29 | } | 29 | } |
30 | 30 | ||
31 | static void gv11b_init_inst_block(struct mem_desc *inst_block, | 31 | static void gv11b_init_inst_block(struct nvgpu_mem *inst_block, |
32 | struct vm_gk20a *vm, u32 big_page_size) | 32 | struct vm_gk20a *vm, u32 big_page_size) |
33 | { | 33 | { |
34 | struct gk20a *g = gk20a_from_vm(vm); | 34 | struct gk20a *g = gk20a_from_vm(vm); |
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c index 8bf0631e..757baa6e 100644 --- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> | 24 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> |
25 | 25 | ||
26 | static void gv11b_init_subcontext_pdb(struct channel_gk20a *c, | 26 | static void gv11b_init_subcontext_pdb(struct channel_gk20a *c, |
27 | struct mem_desc *inst_block); | 27 | struct nvgpu_mem *inst_block); |
28 | 28 | ||
29 | void gv11b_free_subctx_header(struct channel_gk20a *c) | 29 | void gv11b_free_subctx_header(struct channel_gk20a *c) |
30 | { | 30 | { |
@@ -86,7 +86,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c) | |||
86 | } | 86 | } |
87 | 87 | ||
88 | static void gv11b_init_subcontext_pdb(struct channel_gk20a *c, | 88 | static void gv11b_init_subcontext_pdb(struct channel_gk20a *c, |
89 | struct mem_desc *inst_block) | 89 | struct nvgpu_mem *inst_block) |
90 | { | 90 | { |
91 | struct gk20a *g = c->g; | 91 | struct gk20a *g = c->g; |
92 | struct vm_gk20a *vm; | 92 | struct vm_gk20a *vm; |
@@ -126,7 +126,7 @@ static void gv11b_init_subcontext_pdb(struct channel_gk20a *c, | |||
126 | int gv11b_update_subctx_header(struct channel_gk20a *c, u64 gpu_va) | 126 | int gv11b_update_subctx_header(struct channel_gk20a *c, u64 gpu_va) |
127 | { | 127 | { |
128 | struct ctx_header_desc *ctx = &c->ch_ctx.ctx_header; | 128 | struct ctx_header_desc *ctx = &c->ch_ctx.ctx_header; |
129 | struct mem_desc *gr_mem; | 129 | struct nvgpu_mem *gr_mem; |
130 | struct gk20a *g = c->g; | 130 | struct gk20a *g = c->g; |
131 | int ret = 0; | 131 | int ret = 0; |
132 | u32 addr_lo, addr_hi; | 132 | u32 addr_lo, addr_hi; |