diff options
author | Seema Khowala <seemaj@nvidia.com> | 2017-10-12 12:54:04 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-13 16:43:22 -0400 |
commit | ceaab0595c0af8dfe4b71ca4014a9b44a862a0ef (patch) | |
tree | 7b4073b4ffc1bb36aa2bb8177b5b44e323de9c2d /drivers | |
parent | a8643b3a99af5011f4e933967f8a09f227ce4949 (diff) |
gpu: nvgpu: ctxsw_trace_tsg/channel_reset call order
For non fake mmu fault, both tsg and ch pointers
could be valid. If tsg pointer is non null, issue
ctxsw_trace for tsg instead of channel only.
Change-Id: I161c40e8d43c7ae4d953ef4768ad75d4e993c87e
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1577915
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 32915ee1..6312e74a 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -1603,11 +1603,14 @@ static bool gk20a_fifo_handle_mmu_fault( | |||
1603 | } | 1603 | } |
1604 | } | 1604 | } |
1605 | } | 1605 | } |
1606 | 1606 | /* | |
1607 | if (ch) | 1607 | * For non fake mmu fault, both tsg and ch pointers |
1608 | gk20a_ctxsw_trace_channel_reset(g, ch); | 1608 | * could be valid. Check tsg first. |
1609 | else if (tsg) | 1609 | */ |
1610 | if (tsg) | ||
1610 | gk20a_ctxsw_trace_tsg_reset(g, tsg); | 1611 | gk20a_ctxsw_trace_tsg_reset(g, tsg); |
1612 | else if (ch) | ||
1613 | gk20a_ctxsw_trace_channel_reset(g, ch); | ||
1611 | 1614 | ||
1612 | /* disable the channel/TSG from hw and increment | 1615 | /* disable the channel/TSG from hw and increment |
1613 | * syncpoints */ | 1616 | * syncpoints */ |