2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index bca201cf..87923537 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -858,6 +858,10 @@ struct channel_gk20a *gk20a_open_new_channel(struct gk20a *g,
         ch->obj_class = 0;
         ch->interleave_level = NVGPU_RUNLIST_INTERLEAVE_LEVEL_LOW;
         ch->timeslice_us = g->timeslice_low_priority_us;
+#ifdef CONFIG_TEGRA_19x_GPU
+        memset(&ch->t19x, 0, sizeof(struct channel_t19x));
+#endif
+
 
         /* The channel is *not* runnable at this point. It still needs to have
          * an address space bound and allocate a gpfifo and grctx. */
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index 380440b9..46a9b0a7 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -36,6 +36,9 @@ struct fifo_profile_gk20a;
 #include "mm_gk20a.h"
 #include "gr_gk20a.h"
 #include "fence_gk20a.h"
+#ifdef CONFIG_TEGRA_19x_GPU
+#include "channel_t19x.h"
+#endif
 
 struct notification {
         struct {
@@ -276,6 +279,9 @@ struct channel_gk20a {
         u32 runlist_id;
 
         bool is_privileged_channel;
+#ifdef CONFIG_TEGRA_19x_GPU
+        struct channel_t19x t19x;
+#endif
 };
 
 static inline struct channel_gk20a *