2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 83a3a523..ef8a3e7d 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -969,7 +969,7 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force)
 
         gk20a_free_error_notifiers(ch);
 
-        if (g->ops.fecs_trace.unbind_channel)
+        if (g->ops.fecs_trace.unbind_channel && !ch->vpr)
                 g->ops.fecs_trace.unbind_channel(g, ch);
 
         /* release channel ctx */
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index aad6c07b..cb4f8007 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -3303,7 +3303,7 @@ int gk20a_alloc_obj_ctx(struct channel_gk20a  *c,
                                 "fail to load golden ctx image");
                         goto out;
                 }
-                if (g->ops.fecs_trace.bind_channel) {
+                if (g->ops.fecs_trace.bind_channel && !c->vpr) {
                         err = g->ops.fecs_trace.bind_channel(g, c);
                         if (err) {
                                 gk20a_warn(dev_from_gk20a(g),