gpu:nvgpu: update channel_setup_ramfc interface

Pass flags parameter to channel_setup_ramfc for
indicating nvgpu_alloc_gpfifo_args characteristics.

Bug 1645628

Change-Id: Ia40b37c5c7b208d459aa84f1b022036dd5e1b599
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/744526
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Seshendra Gadagottu
2015-05-15 11:53:54 -07:00
committed by Terje Bergstrom
parent f8cc28af38
commit 38cee4d7ef
4 changed files with 6 additions and 5 deletions

View File

@@ -172,7 +172,7 @@ static int channel_gk20a_set_schedule_params(struct channel_gk20a *c,
}
int channel_gk20a_setup_ramfc(struct channel_gk20a *c,
u64 gpfifo_base, u32 gpfifo_entries)
u64 gpfifo_base, u32 gpfifo_entries, u32 flags)
{
void *inst_ptr;
@@ -1142,7 +1142,8 @@ int gk20a_alloc_channel_gpfifo(struct channel_gk20a *c,
channel_gk20a_setup_userd(c);
err = g->ops.fifo.setup_ramfc(c, c->gpfifo.mem.gpu_va, c->gpfifo.entry_num);
err = g->ops.fifo.setup_ramfc(c, c->gpfifo.mem.gpu_va,
c->gpfifo.entry_num, args->flags);
if (err)
goto clean_up_unmap;

View File

@@ -221,6 +221,6 @@ void channel_gk20a_disable(struct channel_gk20a *ch);
int channel_gk20a_alloc_inst(struct gk20a *g, struct channel_gk20a *ch);
void channel_gk20a_free_inst(struct gk20a *g, struct channel_gk20a *ch);
int channel_gk20a_setup_ramfc(struct channel_gk20a *c,
u64 gpfifo_base, u32 gpfifo_entries);
u64 gpfifo_base, u32 gpfifo_entries, u32 flags);
void channel_gk20a_enable(struct channel_gk20a *ch);
#endif /* CHANNEL_GK20A_H */

View File

@@ -218,7 +218,7 @@ struct gpu_ops {
int (*alloc_inst)(struct gk20a *g, struct channel_gk20a *ch);
void (*free_inst)(struct gk20a *g, struct channel_gk20a *ch);
int (*setup_ramfc)(struct channel_gk20a *c, u64 gpfifo_base,
u32 gpfifo_entries);
u32 gpfifo_entries, u32 flags);
int (*resetup_ramfc)(struct channel_gk20a *c);
int (*preempt_channel)(struct gk20a *g, u32 hw_chid);
int (*update_runlist)(struct gk20a *g, u32 runlist_id,

View File

@@ -126,7 +126,7 @@ static void vgpu_channel_disable(struct channel_gk20a *ch)
}
static int vgpu_channel_setup_ramfc(struct channel_gk20a *ch, u64 gpfifo_base,
u32 gpfifo_entries)
u32 gpfifo_entries, u32 flags)
{
struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev);
struct device __maybe_unused *d = dev_from_gk20a(ch->g);