10 files changed, 14 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index bd4e2ff8..e3d9b53a 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -220,7 +220,8 @@ void gk20a_channel_abort(struct channel_gk20a *ch, bool channel_preempt)
         if (channel_preempt && gk20a_is_channel_marked_as_tsg(ch))
                 ch->g->ops.fifo.preempt_channel(ch->g, ch->chid);
 
-        gk20a_channel_abort_clean_up(ch);
+        if (ch->g->ops.fifo.ch_abort_clean_up)
+                ch->g->ops.fifo.ch_abort_clean_up(ch);
 }
 
 int gk20a_wait_channel_idle(struct channel_gk20a *ch)
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 6a7afad7..f069b193 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1432,7 +1432,8 @@ void gk20a_fifo_abort_tsg(struct gk20a *g, u32 tsgid, bool preempt)
         nvgpu_list_for_each_entry(ch, &tsg->ch_list, channel_gk20a, ch_entry) {
                 if (gk20a_channel_get(ch)) {
                         ch->has_timedout = true;
-                        gk20a_channel_abort_clean_up(ch);
+                        if (ch->g->ops.fifo.ch_abort_clean_up)
+                                ch->g->ops.fifo.ch_abort_clean_up(ch);
                         gk20a_channel_put(ch);
                 }
         }
@@ -2016,7 +2017,8 @@ int gk20a_fifo_tsg_unbind_channel(struct channel_gk20a *ch)
         if (!tsg_timedout)
                 g->ops.fifo.enable_tsg(tsg);
 
-        gk20a_channel_abort_clean_up(ch);
+        if (ch->g->ops.fifo.ch_abort_clean_up)
+                ch->g->ops.fifo.ch_abort_clean_up(ch);
 
         return 0;
 
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 7162dc73..43284ba5 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -628,6 +628,7 @@ struct gpu_ops {
                                                 struct tsg_gk20a *tsg);
                 u32 (*get_preempt_timeout)(struct gk20a *g);
                 void (*post_event_id)(struct tsg_gk20a *tsg, int event_id);
+                void (*ch_abort_clean_up)(struct channel_gk20a *ch);
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 int (*alloc_syncpt_buf)(struct channel_gk20a *c,
                                 u32 syncpt_id, struct nvgpu_mem *syncpt_buf);
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index b91795fa..f2ae97cf 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -438,6 +438,7 @@ static const struct gpu_ops gm20b_ops = {
                 .tsg_bind_channel = gk20a_tsg_bind_channel,
                 .tsg_unbind_channel = gk20a_fifo_tsg_unbind_channel,
                 .post_event_id = gk20a_tsg_event_id_post_event,
+                .ch_abort_clean_up = gk20a_channel_abort_clean_up,
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 .alloc_syncpt_buf = gk20a_fifo_alloc_syncpt_buf,
                 .free_syncpt_buf = gk20a_fifo_free_syncpt_buf,
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index bfd1e99a..d87af8d3 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -499,6 +499,7 @@ static const struct gpu_ops gp106_ops = {
                 .tsg_bind_channel = gk20a_tsg_bind_channel,
                 .tsg_unbind_channel = gk20a_fifo_tsg_unbind_channel,
                 .post_event_id = gk20a_tsg_event_id_post_event,
+                .ch_abort_clean_up = gk20a_channel_abort_clean_up,
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 .alloc_syncpt_buf = gk20a_fifo_alloc_syncpt_buf,
                 .free_syncpt_buf = gk20a_fifo_free_syncpt_buf,
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index a6a66f93..3461e184 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -470,6 +470,7 @@ static const struct gpu_ops gp10b_ops = {
                 .tsg_bind_channel = gk20a_tsg_bind_channel,
                 .tsg_unbind_channel = gk20a_fifo_tsg_unbind_channel,
                 .post_event_id = gk20a_tsg_event_id_post_event,
+                .ch_abort_clean_up = gk20a_channel_abort_clean_up,
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 .alloc_syncpt_buf = gk20a_fifo_alloc_syncpt_buf,
                 .free_syncpt_buf = gk20a_fifo_free_syncpt_buf,
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index be9afd8b..8ddc538a 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -511,6 +511,7 @@ static const struct gpu_ops gv100_ops = {
                 .tsg_bind_channel = gk20a_tsg_bind_channel,
                 .tsg_unbind_channel = gk20a_fifo_tsg_unbind_channel,
                 .post_event_id = gk20a_tsg_event_id_post_event,
+                .ch_abort_clean_up = gk20a_channel_abort_clean_up,
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 .alloc_syncpt_buf = gv11b_fifo_alloc_syncpt_buf,
                 .free_syncpt_buf = gv11b_fifo_free_syncpt_buf,
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 2d4f82d1..9af5e96b 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -528,6 +528,7 @@ static const struct gpu_ops gv11b_ops = {
                 .tsg_bind_channel = gk20a_tsg_bind_channel,
                 .tsg_unbind_channel = gk20a_fifo_tsg_unbind_channel,
                 .post_event_id = gk20a_tsg_event_id_post_event,
+                .ch_abort_clean_up = gk20a_channel_abort_clean_up,
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 .alloc_syncpt_buf = gv11b_fifo_alloc_syncpt_buf,
                 .free_syncpt_buf = gv11b_fifo_free_syncpt_buf,
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index 7156a29d..819ca852 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -344,6 +344,7 @@ static const struct gpu_ops vgpu_gp10b_ops = {
                 .tsg_bind_channel = vgpu_tsg_bind_channel,
                 .tsg_unbind_channel = vgpu_tsg_unbind_channel,
                 .post_event_id = gk20a_tsg_event_id_post_event,
+                .ch_abort_clean_up = gk20a_channel_abort_clean_up,
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 .alloc_syncpt_buf = gk20a_fifo_alloc_syncpt_buf,
                 .free_syncpt_buf = gk20a_fifo_free_syncpt_buf,
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index 2c81607d..92d401e9 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -387,6 +387,7 @@ static const struct gpu_ops vgpu_gv11b_ops = {
                 .tsg_bind_channel = vgpu_gv11b_tsg_bind_channel,
                 .tsg_unbind_channel = vgpu_tsg_unbind_channel,
                 .post_event_id = gk20a_tsg_event_id_post_event,
+                .ch_abort_clean_up = gk20a_channel_abort_clean_up,
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 .alloc_syncpt_buf = vgpu_gv11b_fifo_alloc_syncpt_buf,
                 .free_syncpt_buf = gv11b_fifo_free_syncpt_buf,