diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index f311a91a..c83da8b4 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -172,7 +172,7 @@ static int channel_gk20a_set_schedule_params(struct channel_gk20a *c, | |||
172 | } | 172 | } |
173 | 173 | ||
174 | int channel_gk20a_setup_ramfc(struct channel_gk20a *c, | 174 | int channel_gk20a_setup_ramfc(struct channel_gk20a *c, |
175 | u64 gpfifo_base, u32 gpfifo_entries) | 175 | u64 gpfifo_base, u32 gpfifo_entries, u32 flags) |
176 | { | 176 | { |
177 | void *inst_ptr; | 177 | void *inst_ptr; |
178 | 178 | ||
@@ -1142,7 +1142,8 @@ int gk20a_alloc_channel_gpfifo(struct channel_gk20a *c, | |||
1142 | 1142 | ||
1143 | channel_gk20a_setup_userd(c); | 1143 | channel_gk20a_setup_userd(c); |
1144 | 1144 | ||
1145 | err = g->ops.fifo.setup_ramfc(c, c->gpfifo.mem.gpu_va, c->gpfifo.entry_num); | 1145 | err = g->ops.fifo.setup_ramfc(c, c->gpfifo.mem.gpu_va, |
1146 | c->gpfifo.entry_num, args->flags); | ||
1146 | if (err) | 1147 | if (err) |
1147 | goto clean_up_unmap; | 1148 | goto clean_up_unmap; |
1148 | 1149 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index ddb91f9b..5fe03cef 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |||
@@ -221,6 +221,6 @@ void channel_gk20a_disable(struct channel_gk20a *ch); | |||
221 | int channel_gk20a_alloc_inst(struct gk20a *g, struct channel_gk20a *ch); | 221 | int channel_gk20a_alloc_inst(struct gk20a *g, struct channel_gk20a *ch); |
222 | void channel_gk20a_free_inst(struct gk20a *g, struct channel_gk20a *ch); | 222 | void channel_gk20a_free_inst(struct gk20a *g, struct channel_gk20a *ch); |
223 | int channel_gk20a_setup_ramfc(struct channel_gk20a *c, | 223 | int channel_gk20a_setup_ramfc(struct channel_gk20a *c, |
224 | u64 gpfifo_base, u32 gpfifo_entries); | 224 | u64 gpfifo_base, u32 gpfifo_entries, u32 flags); |
225 | void channel_gk20a_enable(struct channel_gk20a *ch); | 225 | void channel_gk20a_enable(struct channel_gk20a *ch); |
226 | #endif /* CHANNEL_GK20A_H */ | 226 | #endif /* CHANNEL_GK20A_H */ |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index d77a9df2..29fa4021 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -218,7 +218,7 @@ struct gpu_ops { | |||
218 | int (*alloc_inst)(struct gk20a *g, struct channel_gk20a *ch); | 218 | int (*alloc_inst)(struct gk20a *g, struct channel_gk20a *ch); |
219 | void (*free_inst)(struct gk20a *g, struct channel_gk20a *ch); | 219 | void (*free_inst)(struct gk20a *g, struct channel_gk20a *ch); |
220 | int (*setup_ramfc)(struct channel_gk20a *c, u64 gpfifo_base, | 220 | int (*setup_ramfc)(struct channel_gk20a *c, u64 gpfifo_base, |
221 | u32 gpfifo_entries); | 221 | u32 gpfifo_entries, u32 flags); |
222 | int (*resetup_ramfc)(struct channel_gk20a *c); | 222 | int (*resetup_ramfc)(struct channel_gk20a *c); |
223 | int (*preempt_channel)(struct gk20a *g, u32 hw_chid); | 223 | int (*preempt_channel)(struct gk20a *g, u32 hw_chid); |
224 | int (*update_runlist)(struct gk20a *g, u32 runlist_id, | 224 | int (*update_runlist)(struct gk20a *g, u32 runlist_id, |
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index 45e7c336..68a31eca 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |||
@@ -126,7 +126,7 @@ static void vgpu_channel_disable(struct channel_gk20a *ch) | |||
126 | } | 126 | } |
127 | 127 | ||
128 | static int vgpu_channel_setup_ramfc(struct channel_gk20a *ch, u64 gpfifo_base, | 128 | static int vgpu_channel_setup_ramfc(struct channel_gk20a *ch, u64 gpfifo_base, |
129 | u32 gpfifo_entries) | 129 | u32 gpfifo_entries, u32 flags) |
130 | { | 130 | { |
131 | struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev); | 131 | struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev); |
132 | struct device __maybe_unused *d = dev_from_gk20a(ch->g); | 132 | struct device __maybe_unused *d = dev_from_gk20a(ch->g); |