4 files changed, 71 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/Makefile b/drivers/gpu/nvgpu/gm20b/Makefile
index 42c3cec0..b779373d 100644
--- a/drivers/gpu/nvgpu/gm20b/Makefile
+++ b/drivers/gpu/nvgpu/gm20b/Makefile
@@ -8,4 +8,5 @@ obj-$(CONFIG_GK20A)  = \
         gr_gm20b.o \
         gr_gm20b.o \
         fb_gm20b.o \
+        fifo_gm20b.o \
         gm20b_gating_reglist.o
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
new file mode 100644
index 00000000..83dc0f79
--- /dev/null
+++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
@@ -0,0 +1,47 @@
+/*
+ * GM20B Fifo
+ *
+ * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include "gk20a/gk20a.h"
+#include "fifo_gm20b.h"
+#include "hw_ccsr_gm20b.h"
+#include "hw_ram_gm20b.h"
+
+static void channel_gm20b_bind(struct channel_gk20a *ch_gk20a)
+{
+        struct gk20a *g = ch_gk20a->g;
+
+        u32 inst_ptr = ch_gk20a->inst_block.cpu_pa
+                >> ram_in_base_shift_v();
+
+        gk20a_dbg_info("bind channel %d inst ptr 0x%08x",
+                ch_gk20a->hw_chid, inst_ptr);
+
+        ch_gk20a->bound = true;
+
+        gk20a_writel(g, ccsr_channel_inst_r(ch_gk20a->hw_chid),
+                ccsr_channel_inst_ptr_f(inst_ptr) |
+                ccsr_channel_inst_target_vid_mem_f() |
+                ccsr_channel_inst_bind_true_f());
+
+        gk20a_writel(g, ccsr_channel_r(ch_gk20a->hw_chid),
+                (gk20a_readl(g, ccsr_channel_r(ch_gk20a->hw_chid)) &
+                 ~ccsr_channel_enable_set_f(~0)) |
+                 ccsr_channel_enable_set_true_f());
+}
+
+void gm20b_init_fifo(struct gpu_ops *gops)
+{
+        gops->fifo.bind_channel = channel_gm20b_bind;
+}
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.h b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.h
new file mode 100644
index 00000000..ca452d21
--- /dev/null
+++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.h
@@ -0,0 +1,21 @@
+/*
+ * GM20B Fifo
+ *
+ * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#ifndef _NVHOST_GM20B_FIFO
+#define _NVHOST_GM20B_FIFO
+struct gk20a;
+
+void gm20b_init_fifo(struct gpu_ops *gops);
+#endif
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 286e5fa5..da633b9f 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -22,6 +22,7 @@
 #include "ltc_gm20b.h"
 #include "fb_gm20b.h"
 #include "gm20b_gating_reglist.h"
+#include "fifo_gm20b.h"
 
 struct gpu_ops gm20b_ops = {
         .clock_gating = {
@@ -45,6 +46,7 @@ int gm20b_init_hal(struct gpu_ops *gops)
         gm20b_init_gr(gops);
         gm20b_init_ltc(gops);
         gm20b_init_fb(gops);
+        gm20b_init_fifo(gops);
         gops->name = "gm20b";
 
         return 0;