3 files changed, 15 insertions, 71 deletions

diff --git a/drivers/gpu/nvgpu/gp106/fuse_gp106.c b/drivers/gpu/nvgpu/gp106/fuse_gp106.c
deleted file mode 100644
index 82e3217f..00000000
--- a/drivers/gpu/nvgpu/gp106/fuse_gp106.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * GP106 FUSE
- *
- * Copyright (c) 2017-2018, 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 <nvgpu/enabled.h>
-#include <nvgpu/io.h>
-
-#include "gk20a/gk20a.h"
-#include "gp106/fuse_gp106.h"
-
-int gp106_fuse_check_priv_security(struct gk20a *g)
-{
-        __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true);
-        __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true);
-
-        return 0;
-}
diff --git a/drivers/gpu/nvgpu/gp106/fuse_gp106.h b/drivers/gpu/nvgpu/gp106/fuse_gp106.h
deleted file mode 100644
index dfb776b8..00000000
--- a/drivers/gpu/nvgpu/gp106/fuse_gp106.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * GP106 FUSE
- *
- * Copyright (c) 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 _NVGPU_GP106_FUSE
-#define _NVGPU_GP106_FUSE
-
-struct gk20a;
-
-int gp106_fuse_check_priv_security(struct gk20a *g);
-
-#endif
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 52fcc9d3..f3b5dd87 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -38,6 +38,9 @@
 #include "common/therm/therm_gp106.h"
 #include "common/ltc/ltc_gm20b.h"
 #include "common/ltc/ltc_gp10b.h"
+#include "common/fuse/fuse_gm20b.h"
+#include "common/fuse/fuse_gp10b.h"
+#include "common/fuse/fuse_gp106.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -60,7 +63,6 @@
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/pmu_gp10b.h"
 #include "gp10b/gr_gp10b.h"
-#include "gp10b/fuse_gp10b.h"
 
 #include "gp106/fifo_gp106.h"
 #include "gp106/regops_gp106.h"
@@ -85,7 +87,6 @@
 #include "gp106/gr_ctx_gp106.h"
 #include "gp106/gr_gp106.h"
 #include "gp106/flcn_gp106.h"
-#include "gp106/fuse_gp106.h"
 
 #include "hal_gp106.h"
 
@@ -788,6 +789,18 @@ static const struct gpu_ops gp106_ops = {
                 .is_opt_ecc_enable = gp10b_fuse_is_opt_ecc_enable,
                 .is_opt_feature_override_disable =
                         gp10b_fuse_is_opt_feature_override_disable,
+                .fuse_status_opt_fbio = gm20b_fuse_status_opt_fbio,
+                .fuse_status_opt_fbp = gm20b_fuse_status_opt_fbp,
+                .fuse_status_opt_rop_l2_fbp = gm20b_fuse_status_opt_rop_l2_fbp,
+                .fuse_status_opt_tpc_gpc = gm20b_fuse_status_opt_tpc_gpc,
+                .fuse_ctrl_opt_tpc_gpc = gm20b_fuse_ctrl_opt_tpc_gpc,
+                .fuse_opt_sec_debug_en = gm20b_fuse_opt_sec_debug_en,
+                .fuse_opt_priv_sec_en = gm20b_fuse_opt_priv_sec_en,
+                .read_vin_cal_fuse_rev = gp106_fuse_read_vin_cal_fuse_rev,
+                .read_vin_cal_slope_intercept_fuse =
+                        gp106_fuse_read_vin_cal_slope_intercept_fuse,
+                .read_vin_cal_gain_offset_fuse =
+                        gp106_fuse_read_vin_cal_gain_offset_fuse,
         },
         .get_litter_value = gp106_get_litter_value,
         .chip_init_gpu_characteristics = gp106_init_gpu_characteristics,