3 files changed, 0 insertions, 98 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/cde_gm20b.c b/drivers/gpu/nvgpu/gm20b/cde_gm20b.c
deleted file mode 100644
index f22e5126..00000000
--- a/drivers/gpu/nvgpu/gm20b/cde_gm20b.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * GM20B CDE
- *
- * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include "gk20a/gk20a.h"
-#include "cde_gm20b.h"
-
-enum programs {
-        PROG_HPASS              = 0,
-        PROG_VPASS_LARGE        = 1,
-        PROG_VPASS_SMALL        = 2,
-        PROG_HPASS_DEBUG        = 3,
-        PROG_VPASS_LARGE_DEBUG  = 4,
-        PROG_VPASS_SMALL_DEBUG  = 5,
-        PROG_PASSTHROUGH        = 6,
-};
-
-void gm20b_cde_get_program_numbers(struct gk20a *g,
-                                          u32 block_height_log2,
-                                          u32 shader_parameter,
-                                          int *hprog_out, int *vprog_out)
-{
-        int hprog = PROG_HPASS;
-        int vprog = (block_height_log2 >= 2) ?
-                PROG_VPASS_LARGE : PROG_VPASS_SMALL;
-        if (shader_parameter == 1) {
-                hprog = PROG_PASSTHROUGH;
-                vprog = PROG_PASSTHROUGH;
-        } else if (shader_parameter == 2) {
-                hprog = PROG_HPASS_DEBUG;
-                vprog = (block_height_log2 >= 2) ?
-                        PROG_VPASS_LARGE_DEBUG :
-                        PROG_VPASS_SMALL_DEBUG;
-        }
-
-        *hprog_out = hprog;
-        *vprog_out = vprog;
-}
diff --git a/drivers/gpu/nvgpu/gm20b/cde_gm20b.h b/drivers/gpu/nvgpu/gm20b/cde_gm20b.h
deleted file mode 100644
index dfd67d62..00000000
--- a/drivers/gpu/nvgpu/gm20b/cde_gm20b.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GM20B CDE
- *
- * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _NVHOST_GM20B_CDE
-#define _NVHOST_GM20B_CDE
-
-struct gk20a;
-
-void gm20b_cde_get_program_numbers(struct gk20a *g,
-                                          u32 block_height_log2,
-                                          u32 shader_parameter,
-                                          int *hprog_out, int *vprog_out);
-
-#endif
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 39d05978..50cc759a 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -50,7 +50,6 @@
 #include "pmu_gm20b.h"
 #include "clk_gm20b.h"
 #include "regops_gm20b.h"
-#include "cde_gm20b.h"
 #include "therm_gm20b.h"
 #include "bus_gm20b.h"
 #include "hal_gm20b.h"
@@ -539,9 +538,6 @@ static const struct gpu_ops gm20b_ops = {
                 .perfbuffer_enable = gk20a_perfbuf_enable_locked,
                 .perfbuffer_disable = gk20a_perfbuf_disable_locked,
         },
-        .cde = {
-                .get_program_numbers = gm20b_cde_get_program_numbers,
-        },
         .bus = {
                 .init_hw = gk20a_bus_init_hw,
                 .isr = gk20a_bus_isr,
@@ -601,7 +597,6 @@ int gm20b_init_hal(struct gk20a *g)
         gops->mc = gm20b_ops.mc;
         gops->dbg_session_ops = gm20b_ops.dbg_session_ops;
         gops->debug = gm20b_ops.debug;
-        gops->cde = gm20b_ops.cde;
         gops->bus = gm20b_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gops->css = gm20b_ops.css;