diff options
author | Richard Zhao <rizhao@nvidia.com> | 2016-03-31 14:16:23 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-31 13:47:22 -0400 |
commit | d707c5a444e024e1184213a75f44a73dbb1707d2 (patch) | |
tree | 09711370df9d9078e4f604e60983877bbf30b9de /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | a71ce831fbbca3ba8602e0b07ecd630c4a39f376 (diff) |
gpu: nvgpu: add tsg support for vgpu
- make tsg_gk20a.c call HAL for enable/disable channels
- add preempt_tsg HAL callbacks
- add tsg bind/unbind channel HAL callbacks
- add according tsg callbacks for vgpu
Bug 1702773
JIRA VFND-1003
Change-Id: I2cba74b3ebd3920ef09219a168e6433d9574dbe8
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/1144932
(cherry picked from commit c3787de7d38651d46969348f5acae2ba86b31ec7)
Reviewed-on: http://git-master/r/1126942
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 92536b36..134a2480 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -2015,7 +2015,7 @@ int gk20a_fifo_preempt(struct gk20a *g, struct channel_gk20a *ch) | |||
2015 | int err; | 2015 | int err; |
2016 | 2016 | ||
2017 | if (gk20a_is_channel_marked_as_tsg(ch)) | 2017 | if (gk20a_is_channel_marked_as_tsg(ch)) |
2018 | err = gk20a_fifo_preempt_tsg(ch->g, ch->tsgid); | 2018 | err = g->ops.fifo.preempt_tsg(ch->g, ch->tsgid); |
2019 | else | 2019 | else |
2020 | err = g->ops.fifo.preempt_channel(ch->g, ch->hw_chid); | 2020 | err = g->ops.fifo.preempt_channel(ch->g, ch->hw_chid); |
2021 | 2021 | ||
@@ -2754,6 +2754,7 @@ void gk20a_init_fifo(struct gpu_ops *gops) | |||
2754 | { | 2754 | { |
2755 | gk20a_init_channel(gops); | 2755 | gk20a_init_channel(gops); |
2756 | gops->fifo.preempt_channel = gk20a_fifo_preempt_channel; | 2756 | gops->fifo.preempt_channel = gk20a_fifo_preempt_channel; |
2757 | gops->fifo.preempt_tsg = gk20a_fifo_preempt_tsg; | ||
2757 | gops->fifo.update_runlist = gk20a_fifo_update_runlist; | 2758 | gops->fifo.update_runlist = gk20a_fifo_update_runlist; |
2758 | gops->fifo.trigger_mmu_fault = gk20a_fifo_trigger_mmu_fault; | 2759 | gops->fifo.trigger_mmu_fault = gk20a_fifo_trigger_mmu_fault; |
2759 | gops->fifo.apply_pb_timeout = gk20a_fifo_apply_pb_timeout; | 2760 | gops->fifo.apply_pb_timeout = gk20a_fifo_apply_pb_timeout; |