diff options
author | Thomas Fleury <tfleury@nvidia.com> | 2016-04-11 20:06:20 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-21 14:29:13 -0400 |
commit | 4df6cd4a345d9a564f2235bc6a20ebb4614c2b04 (patch) | |
tree | e6bf733972915929cba22882a74b04cf133be14e /drivers/gpu/nvgpu/vgpu | |
parent | a21dcf0bc6bca226582aae45e3a92fe1f7c19e56 (diff) |
gpu: nvgpu: add ctxsw channel reset event
Generate a ctxsw channel reset when engine needs to be reset.
This event is generated by the driver, while other events are
generated by FECS.
JIRA ELVR-314
Change-Id: I7791cf3e538782464c37c442c871acb177484566
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: http://git-master/r/1129029
(cherry picked from commit 114038a1a5d9e8941bc53f3e95115b01dd1f8c6e)
Reviewed-on: http://git-master/r/1134379
(cherry picked from commit 15fa2a7b48a0937dfd449ca0c4ed5ad3a863d6bf)
Reviewed-on: http://git-master/r/1123916
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index d1cba979..83fd65ff 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <trace/events/gk20a.h> | 17 | #include <trace/events/gk20a.h> |
18 | 18 | ||
19 | #include "vgpu/vgpu.h" | 19 | #include "vgpu/vgpu.h" |
20 | #include "gk20a/ctxsw_trace_gk20a.h" | ||
20 | #include "gk20a/hw_fifo_gk20a.h" | 21 | #include "gk20a/hw_fifo_gk20a.h" |
21 | #include "gk20a/hw_ram_gk20a.h" | 22 | #include "gk20a/hw_ram_gk20a.h" |
22 | 23 | ||
@@ -629,7 +630,7 @@ int vgpu_fifo_isr(struct gk20a *g, struct tegra_vgpu_fifo_intr_info *info) | |||
629 | gk20a_err(dev_from_gk20a(g), "fifo intr (%d) on ch %u", | 630 | gk20a_err(dev_from_gk20a(g), "fifo intr (%d) on ch %u", |
630 | info->type, info->chid); | 631 | info->type, info->chid); |
631 | 632 | ||
632 | trace_gk20a_channel_reset(ch->hw_chid, ch->tsgid); | 633 | gk20a_ctxsw_trace_channel_reset(g, ch); |
633 | 634 | ||
634 | switch (info->type) { | 635 | switch (info->type) { |
635 | case TEGRA_VGPU_FIFO_INTR_PBDMA: | 636 | case TEGRA_VGPU_FIFO_INTR_PBDMA: |