summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/vgpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r--drivers/gpu/nvgpu/vgpu/fifo_vgpu.c6
-rw-r--r--drivers/gpu/nvgpu/vgpu/fifo_vgpu.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 9e3f7867..234f6fd4 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -443,10 +443,8 @@ int vgpu_init_fifo_support(struct gk20a *g)
443 return err; 443 return err;
444} 444}
445 445
446int vgpu_fifo_preempt_channel(struct gk20a *g, u32 chid) 446int vgpu_fifo_preempt_channel(struct gk20a *g, struct channel_gk20a *ch)
447{ 447{
448 struct fifo_gk20a *f = &g->fifo;
449 struct channel_gk20a *ch = &f->channel[chid];
450 struct tegra_vgpu_cmd_msg msg; 448 struct tegra_vgpu_cmd_msg msg;
451 struct tegra_vgpu_channel_config_params *p = 449 struct tegra_vgpu_channel_config_params *p =
452 &msg.params.channel_config; 450 &msg.params.channel_config;
@@ -464,7 +462,7 @@ int vgpu_fifo_preempt_channel(struct gk20a *g, u32 chid)
464 462
465 if (err || msg.ret) { 463 if (err || msg.ret) {
466 nvgpu_err(g, 464 nvgpu_err(g,
467 "preempt channel %d failed", chid); 465 "preempt channel %d failed", ch->chid);
468 err = -ENOMEM; 466 err = -ENOMEM;
469 } 467 }
470 468
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.h b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.h
index 8c042033..db199f8f 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.h
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.h
@@ -41,7 +41,7 @@ int vgpu_channel_setup_ramfc(struct channel_gk20a *ch, u64 gpfifo_base,
41 u32 gpfifo_entries, 41 u32 gpfifo_entries,
42 unsigned long acquire_timeout, u32 flags); 42 unsigned long acquire_timeout, u32 flags);
43int vgpu_fifo_init_engine_info(struct fifo_gk20a *f); 43int vgpu_fifo_init_engine_info(struct fifo_gk20a *f);
44int vgpu_fifo_preempt_channel(struct gk20a *g, u32 chid); 44int vgpu_fifo_preempt_channel(struct gk20a *g, struct channel_gk20a *ch);
45int vgpu_fifo_preempt_tsg(struct gk20a *g, struct tsg_gk20a *tsg); 45int vgpu_fifo_preempt_tsg(struct gk20a *g, struct tsg_gk20a *tsg);
46int vgpu_fifo_update_runlist(struct gk20a *g, u32 runlist_id, 46int vgpu_fifo_update_runlist(struct gk20a *g, u32 runlist_id,
47 u32 chid, bool add, bool wait_for_finish); 47 u32 chid, bool add, bool wait_for_finish);