summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 9f2e0017..777d7ca9 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -28,6 +28,7 @@
28 28
29#include "debug_gk20a.h" 29#include "debug_gk20a.h"
30 30
31#include "gr_ops.h"
31#include "gk20a.h" 32#include "gk20a.h"
32#include "dbg_gpu_gk20a.h" 33#include "dbg_gpu_gk20a.h"
33#include "fence_gk20a.h" 34#include "fence_gk20a.h"
@@ -638,7 +639,7 @@ void gk20a_free_channel(struct channel_gk20a *ch, bool finish)
638 gk20a_free_error_notifiers(ch); 639 gk20a_free_error_notifiers(ch);
639 640
640 /* release channel ctx */ 641 /* release channel ctx */
641 g->ops.gr.free_channel_ctx(ch); 642 g->ops.gr->free_channel_ctx(ch);
642 643
643 gk20a_gr_flush_channel_tlb(gr); 644 gk20a_gr_flush_channel_tlb(gr);
644 645
@@ -1558,8 +1559,8 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c,
1558 1559
1559#ifdef CONFIG_DEBUG_FS 1560#ifdef CONFIG_DEBUG_FS
1560 /* update debug settings */ 1561 /* update debug settings */
1561 if (g->ops.ltc.sync_debugfs) 1562 if (g->ops.ltc->sync_debugfs)
1562 g->ops.ltc.sync_debugfs(g); 1563 g->ops.ltc->sync_debugfs(g);
1563#endif 1564#endif
1564 1565
1565 gk20a_dbg_info("channel %d", c->hw_chid); 1566 gk20a_dbg_info("channel %d", c->hw_chid);
@@ -2080,7 +2081,7 @@ static int gk20a_channel_zcull_bind(struct channel_gk20a *ch,
2080 2081
2081 gk20a_dbg_fn(""); 2082 gk20a_dbg_fn("");
2082 2083
2083 return g->ops.gr.bind_ctxsw_zcull(g, gr, ch, 2084 return g->ops.gr->bind_ctxsw_zcull(g, gr, ch,
2084 args->gpu_va, args->mode); 2085 args->gpu_va, args->mode);
2085} 2086}
2086 2087
@@ -2300,7 +2301,7 @@ long gk20a_channel_ioctl(struct file *filp,
2300 __func__, cmd); 2301 __func__, cmd);
2301 return err; 2302 return err;
2302 } 2303 }
2303 err = ch->g->ops.gr.alloc_obj_ctx(ch, 2304 err = ch->g->ops.gr->alloc_obj_ctx(ch,
2304 (struct nvgpu_alloc_obj_ctx_args *)buf); 2305 (struct nvgpu_alloc_obj_ctx_args *)buf);
2305 gk20a_idle(dev); 2306 gk20a_idle(dev);
2306 break; 2307 break;
@@ -2312,7 +2313,7 @@ long gk20a_channel_ioctl(struct file *filp,
2312 __func__, cmd); 2313 __func__, cmd);
2313 return err; 2314 return err;
2314 } 2315 }
2315 err = ch->g->ops.gr.free_obj_ctx(ch, 2316 err = ch->g->ops.gr->free_obj_ctx(ch,
2316 (struct nvgpu_free_obj_ctx_args *)buf); 2317 (struct nvgpu_free_obj_ctx_args *)buf);
2317 gk20a_idle(dev); 2318 gk20a_idle(dev);
2318 break; 2319 break;