summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2017-10-26 05:27:05 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-10-29 14:01:53 -0400
commit3afb2a88d5a93cd5ee3f588025f45b986bed0762 (patch)
treec55830306bea8f76d92d8895bfc48c1a95c228ae /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
parent8a9261d14a5205145b5daa12a8fad9129756e247 (diff)
gpu: nvgpu: skip channel status verification if TSG has timed out
In gk20a_fifo_tsg_unbind_channel(), we always verify channel status before unbinding a channel from TSG But in case TSG has alread timed out we never re-enable it so it does not make sense to inspect channel status anyways So skip channel status verification in case TSG has timed out Bug 200327095 Change-Id: Iccf601271290643c235c3f2656201549210a6886 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1586015 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 194824c3..d10af9e9 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1966,7 +1966,7 @@ int gk20a_fifo_tsg_unbind_channel(struct channel_gk20a *ch)
1966 if (err) 1966 if (err)
1967 goto fail_enable_tsg; 1967 goto fail_enable_tsg;
1968 1968
1969 if (g->ops.fifo.tsg_verify_channel_status) { 1969 if (g->ops.fifo.tsg_verify_channel_status && !tsg_timedout) {
1970 err = g->ops.fifo.tsg_verify_channel_status(ch); 1970 err = g->ops.fifo.tsg_verify_channel_status(ch);
1971 if (err) 1971 if (err)
1972 goto fail_enable_tsg; 1972 goto fail_enable_tsg;