summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
diff options
context:
space:
mode:
authorThomas Fleury <tfleury@nvidia.com>2016-04-11 20:06:20 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-05-21 14:29:13 -0400
commit4df6cd4a345d9a564f2235bc6a20ebb4614c2b04 (patch)
treee6bf733972915929cba22882a74b04cf133be14e /drivers/gpu/nvgpu/gk20a/channel_gk20a.c
parenta21dcf0bc6bca226582aae45e3a92fe1f7c19e56 (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/gk20a/channel_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 31a3ceeb..d99c48fb 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -886,7 +886,7 @@ static void gk20a_free_channel(struct channel_gk20a *ch)
886 /* if lock is already taken, a reset is taking place 886 /* if lock is already taken, a reset is taking place
887 so no need to repeat */ 887 so no need to repeat */
888 if (!was_reset) { 888 if (!was_reset) {
889 trace_gk20a_channel_reset(ch->hw_chid, ch->tsgid); 889 gk20a_ctxsw_trace_channel_reset(g, ch);
890 gk20a_fifo_reset_engine(g, 890 gk20a_fifo_reset_engine(g,
891 g->fifo.deferred_fault_engines); 891 g->fifo.deferred_fault_engines);
892 } 892 }