gpu: nvgpu: Move FB to common

Move all FB HAL implementations to common/fb.

JIRA NVGPU-596

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

3 files changed, 4 insertions, 83 deletions

diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/gp106/fb_gp106.c
deleted file mode 100644
index 2bf97f61..00000000
--- a/drivers/gpu/nvgpu/gp106/fb_gp106.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2016-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 "gk20a/gk20a.h"
-#include "gp10b/fb_gp10b.h"
-
-#include "fb_gp106.h"
-
-#include <nvgpu/hw/gp106/hw_fb_gp106.h>
-
-#define HW_SCRUB_TIMEOUT_DEFAULT        100 /* usec */
-#define HW_SCRUB_TIMEOUT_MAX            2000000 /* usec */
-
-void gp106_fb_reset(struct gk20a *g)
-{
-        u32 val;
-
-        int retries = HW_SCRUB_TIMEOUT_MAX / HW_SCRUB_TIMEOUT_DEFAULT;
-        /* wait for memory to be accessible */
-        do {
-                u32 w = gk20a_readl(g, fb_niso_scrub_status_r());
-                if (fb_niso_scrub_status_flag_v(w)) {
-                        nvgpu_log_fn(g, "done");
-                        break;
-                }
-                nvgpu_udelay(HW_SCRUB_TIMEOUT_DEFAULT);
-        } while (--retries);
-
-        val = gk20a_readl(g, fb_mmu_priv_level_mask_r());
-        val &= ~fb_mmu_priv_level_mask_write_violation_m();
-        gk20a_writel(g, fb_mmu_priv_level_mask_r(), val);
-}
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.h b/drivers/gpu/nvgpu/gp106/fb_gp106.h
deleted file mode 100644
index d5ee87f4..00000000
--- a/drivers/gpu/nvgpu/gp106/fb_gp106.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016-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 FB_GP106_H
-#define FB_GP106_H
-struct gpu_ops;
-
-void gp106_fb_reset(struct gk20a *g);
-#endif
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 75e2f5a1..63e6206a 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -27,6 +27,10 @@
 #include "common/ptimer/ptimer_gk20a.h"
 #include "common/bus/bus_gm20b.h"
 #include "common/bus/bus_gp10b.h"
+#include "common/fb/fb_gk20a.h"
+#include "common/fb/fb_gp10b.h"
+#include "common/fb/fb_gm20b.h"
+#include "common/fb/fb_gp106.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -37,7 +41,6 @@
 #include "gk20a/flcn_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/mc_gk20a.h"
-#include "gk20a/fb_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
@@ -50,7 +53,6 @@
 #include "gp10b/regops_gp10b.h"
 #include "gp10b/priv_ring_gp10b.h"
 #include "gp10b/fifo_gp10b.h"
-#include "gp10b/fb_gp10b.h"
 #include "gp10b/pmu_gp10b.h"
 #include "gp10b/gr_gp10b.h"
 #include "gp10b/priv_ring_gp10b.h"
@@ -63,7 +65,6 @@
 #include "gm20b/fifo_gm20b.h"
 #include "gm20b/mm_gm20b.h"
 #include "gm20b/pmu_gm20b.h"
-#include "gm20b/fb_gm20b.h"
 #include "gm20b/acr_gm20b.h"
 #include "gm20b/gr_gm20b.h"
 
@@ -81,7 +82,6 @@
 #include "gp106/pmu_gp106.h"
 #include "gp106/gr_ctx_gp106.h"
 #include "gp106/gr_gp106.h"
-#include "gp106/fb_gp106.h"
 #include "gp106/flcn_gp106.h"
 #include "gp106/fuse_gp106.h"