gpu: nvgpu: gp106: Skip resetting FB

FB is enabled in devinit. Skip resetting it in GPU boot.

Bug 1799537

Change-Id: I0748127f0962e7d6d2bf0ecece6773fdf9c35bc8
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1208715
(cherry picked from commit ceafac52f5711bd987b746686f11b22807f74698)
Reviewed-on: http://git-master/r/1227265
GVS: Gerrit_Virtual_Submit

4 files changed, 47 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu-t18x b/drivers/gpu/nvgpu/Makefile.nvgpu-t18x
index cd4ce5ce..167a0ae2 100644
--- a/drivers/gpu/nvgpu/Makefile.nvgpu-t18x
+++ b/drivers/gpu/nvgpu/Makefile.nvgpu-t18x
@@ -28,6 +28,7 @@ nvgpu-y += \
         $(nvgpu-t18x)/gp106/sec2_gp106.o \
         $(nvgpu-t18x)/gp106/fifo_gp106.o \
         $(nvgpu-t18x)/gp106/ltc_gp106.o \
+        $(nvgpu-t18x)/gp106/fb_gp106.o \
         $(nvgpu-t18x)/clk/clk_mclk.o \
         $(nvgpu-t18x)/pstate/pstate.o \
         $(nvgpu-t18x)/clk/clk_vin.o \
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/gp106/fb_gp106.c
new file mode 100644
index 00000000..1c5b3e0a
--- /dev/null
+++ b/drivers/gpu/nvgpu/gp106/fb_gp106.c
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+#include <linux/types.h>
+
+#include "gk20a/gk20a.h"
+#include "gp10b/fb_gp10b.h"
+
+void gp106_init_fb(struct gpu_ops *gops)
+{
+        gp10b_init_fb(gops);
+
+        gops->fb.init_fs_state = NULL;
+        gops->fb.reset = NULL;
+}
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.h b/drivers/gpu/nvgpu/gp106/fb_gp106.h
new file mode 100644
index 00000000..87b371e1
--- /dev/null
+++ b/drivers/gpu/nvgpu/gp106/fb_gp106.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+
+#ifndef FB_GP106_H
+#define FB_GP106_H
+struct gpu_ops;
+
+void gp106_init_fb(struct gpu_ops *gops);
+#endif
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 6c8ac7bc..5f15a2c8 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -25,7 +25,6 @@
 #include "gp106/ltc_gp106.h"
 #include "gp10b/mm_gp10b.h"
 #include "gp10b/ce_gp10b.h"
-#include "gp10b/fb_gp10b.h"
 #include "gp106/fifo_gp106.h"
 #include "gp10b/gp10b_gating_reglist.h"
 #include "gp10b/regops_gp10b.h"
@@ -43,6 +42,7 @@
 #include "gp106/pmu_gp106.h"
 #include "gp106/gr_ctx_gp106.h"
 #include "gp106/gr_gp106.h"
+#include "gp106/fb_gp106.h"
 #include "nvgpu_gpuid_t18x.h"
 #include "hw_proj_gp106.h"
 #include "gk20a/dbg_gpu_gk20a.h"
@@ -148,7 +148,7 @@ int gp106_init_hal(struct gk20a *g)
         gp10b_init_mc(gops);
         gp106_init_gr(gops);
         gp106_init_ltc(gops);
-        gp10b_init_fb(gops);
+        gp106_init_fb(gops);
         gp106_init_fifo(gops);
         gp10b_init_ce(gops);
         gp106_init_gr_ctx(gops);