4 files changed, 61 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c
new file mode 100644
index 00000000..a90a9b5b
--- /dev/null
+++ b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c
@@ -0,0 +1,28 @@
+/*
+ * GK20A Graphics Copy Engine  (gr host)
+ *
+ * Copyright (c) 2011-2015, 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*TODO: remove uncecessary */
+#include "gk20a/gk20a.h"
+#include "ce2_gm20b.h"
+
+void gm20b_init_ce2(struct gpu_ops *gops)
+{
+        gops->ce2.isr_stall = gk20a_ce2_isr;
+        gops->ce2.isr_nonstall = gk20a_ce2_nonstall_isr;
+}
diff --git a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.h b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.h
new file mode 100644
index 00000000..10d7ef8c
--- /dev/null
+++ b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.h
@@ -0,0 +1,29 @@
+/*
+ * drivers/video/tegra/host/gk20a/fifo_gk20a.h
+ *
+ * GK20A graphics copy engine (gr host)
+ *
+ * Copyright (c) 2011-2015, 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.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef __CE2_GM20B_H__
+#define __CE2_GM20B_H__
+
+#include "gk20a/channel_gk20a.h"
+#include "gk20a/tsg_gk20a.h"
+
+void gm20b_init_ce2(struct gpu_ops *gops);
+
+#endif /*__CE2_GM20B_H__*/
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
index 640448cb..6d186c10 100644
--- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
@@ -1,7 +1,7 @@
 /*
  * GM20B Fifo
  *
- * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2015, 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,
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 5dc0c212..d5a6e422 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -18,6 +18,7 @@
 #include "gk20a/gk20a.h"
 
 #include "ltc_gm20b.h"
+#include "ce2_gm20b.h"
 #include "gr_gm20b.h"
 #include "ltc_gm20b.h"
 #include "fb_gm20b.h"
@@ -81,7 +82,7 @@ static struct gpu_ops gm20b_ops = {
                         gm20b_blcg_pmu_load_gating_prod,
                 .pg_gr_load_gating_prod =
                         gr_gm20b_pg_gr_load_gating_prod,
-        }
+        },
 };
 
 int gm20b_init_hal(struct gk20a *g)
@@ -124,6 +125,7 @@ int gm20b_init_hal(struct gk20a *g)
         gm20b_init_ltc(gops);
         gm20b_init_fb(gops);
         gm20b_init_fifo(gops);
+        gm20b_init_ce2(gops);
         gm20b_init_gr_ctx(gops);
         gm20b_init_mm(gops);
         gm20b_init_pmu_ops(gops);