1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 46cbfd8c..9e4d3c37 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -8077,6 +8077,7 @@ bool gk20a_is_channel_ctx_resident(struct channel_gk20a *ch)
         struct gk20a *g = ch->g;
         struct channel_gk20a *curr_ch;
         bool ret = false;
+        struct tsg_gk20a *tsg;
 
         curr_gr_ctx  = gk20a_readl(g, gr_fecs_current_ctx_r());
 
@@ -8108,7 +8109,8 @@ bool gk20a_is_channel_ctx_resident(struct channel_gk20a *ch)
                 ret = true;
         }
 
-        if (gk20a_is_channel_marked_as_tsg(ch) && (ch->tsgid == curr_gr_tsgid)) {
+        tsg = tsg_gk20a_from_ch(ch);
+        if ((tsg != NULL) && (tsg->tsgid == curr_gr_tsgid)) {
                 ret = true;
         }