diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c index 3f39ced1..0fa9e65a 100644 --- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c | |||
@@ -626,16 +626,16 @@ void gk20a_ctxsw_trace_channel_reset(struct gk20a *g, struct channel_gk20a *ch) | |||
626 | #ifdef CONFIG_GK20A_CTXSW_TRACE | 626 | #ifdef CONFIG_GK20A_CTXSW_TRACE |
627 | struct nvgpu_ctxsw_trace_entry entry = { | 627 | struct nvgpu_ctxsw_trace_entry entry = { |
628 | .vmid = 0, | 628 | .vmid = 0, |
629 | .tag = NVGPU_CTXSW_TAG_RESET, | 629 | .tag = NVGPU_CTXSW_TAG_ENGINE_RESET, |
630 | .timestamp = gk20a_read_ptimer(g), | 630 | .timestamp = gk20a_read_ptimer(g), |
631 | .context_id = 0, | 631 | .context_id = 0, |
632 | .pid = ch->pid, | 632 | .pid = ch->pid, |
633 | }; | 633 | }; |
634 | 634 | ||
635 | gk20a_ctxsw_trace_write(g, &entry); | 635 | gk20a_ctxsw_trace_write(g, &entry); |
636 | gk20a_ctxsw_trace_wake_up(g, 0); | ||
636 | #endif | 637 | #endif |
637 | trace_gk20a_channel_reset(ch->hw_chid, ch->tsgid); | 638 | trace_gk20a_channel_reset(ch->hw_chid, ch->tsgid); |
638 | gk20a_ctxsw_trace_wake_up(g, 0); | ||
639 | } | 639 | } |
640 | 640 | ||
641 | void gk20a_ctxsw_trace_tsg_reset(struct gk20a *g, struct tsg_gk20a *tsg) | 641 | void gk20a_ctxsw_trace_tsg_reset(struct gk20a *g, struct tsg_gk20a *tsg) |
@@ -643,7 +643,7 @@ void gk20a_ctxsw_trace_tsg_reset(struct gk20a *g, struct tsg_gk20a *tsg) | |||
643 | #ifdef CONFIG_GK20A_CTXSW_TRACE | 643 | #ifdef CONFIG_GK20A_CTXSW_TRACE |
644 | struct nvgpu_ctxsw_trace_entry entry = { | 644 | struct nvgpu_ctxsw_trace_entry entry = { |
645 | .vmid = 0, | 645 | .vmid = 0, |
646 | .tag = NVGPU_CTXSW_TAG_RESET, | 646 | .tag = NVGPU_CTXSW_TAG_ENGINE_RESET, |
647 | .timestamp = gk20a_read_ptimer(g), | 647 | .timestamp = gk20a_read_ptimer(g), |
648 | .context_id = 0, | 648 | .context_id = 0, |
649 | .pid = 0, | 649 | .pid = 0, |
@@ -657,9 +657,9 @@ void gk20a_ctxsw_trace_tsg_reset(struct gk20a *g, struct tsg_gk20a *tsg) | |||
657 | entry.pid = ch->pid; | 657 | entry.pid = ch->pid; |
658 | 658 | ||
659 | gk20a_ctxsw_trace_write(g, &entry); | 659 | gk20a_ctxsw_trace_write(g, &entry); |
660 | gk20a_ctxsw_trace_wake_up(g, 0); | ||
660 | #endif | 661 | #endif |
661 | trace_gk20a_channel_reset(~0, tsg->tsgid); | 662 | trace_gk20a_channel_reset(~0, tsg->tsgid); |
662 | gk20a_ctxsw_trace_wake_up(g, 0); | ||
663 | } | 663 | } |
664 | 664 | ||
665 | void gk20a_ctxsw_trace_init_ops(struct gpu_ops *ops) | 665 | void gk20a_ctxsw_trace_init_ops(struct gpu_ops *ops) |