gpu: nvgpu: Reorg ce2 HAL initialization

Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch only covers the ce2
sub-module of the gpu_ops struct.

Perform HAL function assignments in hal_gxxxx.c through the
population of a chip-specific copy of gpu_ops.

Jira NVGPU-74

Change-Id: I7dfd5e8dcd4d6f3623d1b795b6b2e15ff356a13a
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1509632
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

3 files changed, 6 insertions, 59 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c
deleted file mode 100644
index a90a9b5b..00000000
--- a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 10d7ef8c..00000000
--- a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 228e1a97..c89f3746 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -14,6 +14,7 @@
  */
 
 #include "gk20a/gk20a.h"
+#include "gk20a/ce2_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
@@ -24,7 +25,6 @@
 #include "gk20a/regops_gk20a.h"
 
 #include "ltc_gm20b.h"
-#include "ce2_gm20b.h"
 #include "gr_gm20b.h"
 #include "ltc_gm20b.h"
 #include "fb_gm20b.h"
@@ -158,6 +158,10 @@ static const struct gpu_ops gm20b_ops = {
                 .sync_debugfs = gm20b_ltc_sync_debugfs,
 #endif
         },
+        .ce2 = {
+                .isr_stall = gk20a_ce2_isr,
+                .isr_nonstall = gk20a_ce2_nonstall_isr,
+        },
         .clock_gating = {
                 .slcg_bus_load_gating_prod =
                         gm20b_slcg_bus_load_gating_prod,
@@ -332,6 +336,7 @@ int gm20b_init_hal(struct gk20a *g)
         u32 val;
 
         gops->ltc = gm20b_ops.ltc;
+        gops->ce2 = gm20b_ops.ce2;
         gops->clock_gating = gm20b_ops.clock_gating;
         gops->fifo = gm20b_ops.fifo;
         gops->mc = gm20b_ops.mc;
@@ -384,7 +389,6 @@ int gm20b_init_hal(struct gk20a *g)
         g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT;
         gm20b_init_gr(g);
         gm20b_init_fb(gops);
-        gm20b_init_ce2(gops);
         gm20b_init_gr_ctx(gops);
         gm20b_init_mm(gops);
         gm20b_init_pmu_ops(g);