gpu: nvgpu: Move rest of CDE structures to Linux

Move rest of CDE structures to common/linux. This includes moving
the per-chip firmware file interpretation functions, and removing CDE
ops from HAL and adding it to nvgpu_os_linux.

JIRA NVGPU-259

Change-Id: I59d8f44bddadecef81ad3c455b363a14034c5e13
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1570403
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 0 insertions, 12 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c
index 618c80f8..fc9b0e83 100644
--- a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c
+++ b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c
@@ -42,7 +42,6 @@
 #include "gm20b/pmu_gm20b.h"
 #include "gm20b/fb_gm20b.h"
 #include "gm20b/bus_gm20b.h"
-#include "gm20b/cde_gm20b.h"
 #include "gm20b/regops_gm20b.h"
 #include "gm20b/clk_gm20b.h"
 #include "gm20b/therm_gm20b.h"
@@ -438,9 +437,6 @@ static const struct gpu_ops vgpu_gm20b_ops = {
                 .perfbuffer_enable = vgpu_perfbuffer_enable,
                 .perfbuffer_disable = vgpu_perfbuffer_disable,
         },
-        .cde = {
-                .get_program_numbers = gm20b_cde_get_program_numbers,
-        },
         .bus = {
                 .init_hw = gk20a_bus_init_hw,
                 .isr = gk20a_bus_isr,
@@ -501,7 +497,6 @@ int vgpu_gm20b_init_hal(struct gk20a *g)
         gops->mc = vgpu_gm20b_ops.mc;
         gops->dbg_session_ops = vgpu_gm20b_ops.dbg_session_ops;
         gops->debug = vgpu_gm20b_ops.debug;
-        gops->cde = vgpu_gm20b_ops.cde;
         gops->bus = vgpu_gm20b_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gops->css = vgpu_gm20b_ops.css;
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index aae74e3f..2c59d847 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -50,7 +50,6 @@
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/gp10b_gating_reglist.h"
 #include "gp10b/regops_gp10b.h"
-#include "gp10b/cde_gp10b.h"
 #include "gp10b/therm_gp10b.h"
 #include "gp10b/priv_ring_gp10b.h"
 
@@ -478,11 +477,6 @@ static const struct gpu_ops vgpu_gp10b_ops = {
                 .perfbuffer_enable = vgpu_perfbuffer_enable,
                 .perfbuffer_disable = vgpu_perfbuffer_disable,
         },
-        .cde = {
-                .get_program_numbers = gp10b_cde_get_program_numbers,
-                .need_scatter_buffer = gp10b_need_scatter_buffer,
-                .populate_scatter_buffer = gp10b_populate_scatter_buffer,
-        },
         .bus = {
                 .init_hw = gk20a_bus_init_hw,
                 .isr = gk20a_bus_isr,
@@ -533,7 +527,6 @@ int vgpu_gp10b_init_hal(struct gk20a *g)
         gops->mc = vgpu_gp10b_ops.mc;
         gops->debug = vgpu_gp10b_ops.debug;
         gops->dbg_session_ops = vgpu_gp10b_ops.dbg_session_ops;
-        gops->cde = vgpu_gp10b_ops.cde;
         gops->bus = vgpu_gp10b_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gops->css = vgpu_gp10b_ops.css;