From 16d54e83bfefb5222e59f5d60817c64219f2cfe1 Mon Sep 17 00:00:00 2001
From: Antony Clince Alex <aalex@nvidia.com>
Date: Sun, 9 Aug 2020 15:30:02 +0530
Subject: [PATCH] gpu: nvgpu: remove nvgpu_next functions from nvgpu_mc unit

At present nvgpu_mc unit contains nvgpu_next_mc function definitions under
conditional compilation macro. Move these functions to nvgpu_next specific
files.

Jira NVGPU-6004

Change-Id: Ieef68dad3c20941fd5580cad7341f165880f08ad
Signed-off-by: Antony Clince Alex <aalex@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2396323
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
---
 drivers/gpu/nvgpu/common/mc/mc.c     | 41 ----------------------------
 drivers/gpu/nvgpu/include/nvgpu/mc.h | 10 ++-----
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/drivers/gpu/nvgpu/common/mc/mc.c b/drivers/gpu/nvgpu/common/mc/mc.c
index ffd893540..148187a2b 100644
--- a/drivers/gpu/nvgpu/common/mc/mc.c
+++ b/drivers/gpu/nvgpu/common/mc/mc.c
@@ -123,44 +123,3 @@ void nvgpu_mc_intr_nonstall_resume(struct gk20a *g)
 	g->ops.mc.intr_nonstall_resume(g);
 	nvgpu_spinunlock_irqrestore(&g->mc.intr_lock, flags);
 }
-
-#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
-void nvgpu_mc_intr_unit_vectorid_init(struct gk20a *g, u32 unit,
-		u32 *vectorid, u32 num_entries)
-{
-	unsigned long flags = 0;
-	u32 i = 0U;
-	struct nvgpu_intr_unit_info *intr_unit_info;
-
-	nvgpu_assert(num_entries <= MC_INTR_VECTORID_SIZE_MAX);
-
-	intr_unit_info = g->mc.nvgpu_next.intr_unit_info;
-
-	nvgpu_spinlock_irqsave(&g->mc.intr_lock, flags);
-
-	if (intr_unit_info[unit].valid == false) {
-		for (i = 0U; i < num_entries; i++) {
-			intr_unit_info[unit].vectorid[i] = *(vectorid + i);
-		}
-		intr_unit_info[unit].vectorid_size = num_entries;
-	}
-	nvgpu_spinunlock_irqrestore(&g->mc.intr_lock, flags);
-}
-
-bool nvgpu_mc_intr_is_unit_info_valid(struct gk20a *g, u32 unit)
-{
-	unsigned long flags = 0;
-	struct nvgpu_intr_unit_info *intr_unit_info;
-	bool info_valid = false;
-
-	intr_unit_info = g->mc.nvgpu_next.intr_unit_info;
-
-	nvgpu_spinlock_irqsave(&g->mc.intr_lock, flags);
-	if (intr_unit_info[unit].valid == true) {
-		info_valid = true;
-	}
-	nvgpu_spinunlock_irqrestore(&g->mc.intr_lock, flags);
-
-	return info_valid;
-}
-#endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/mc.h b/drivers/gpu/nvgpu/include/nvgpu/mc.h
index 94f70dcbd..d47f49140 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/mc.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/mc.h
@@ -117,12 +117,12 @@
 #include <nvgpu/atomic.h>
 #include <nvgpu/lock.h>
 
+struct gk20a;
+
 #if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
 #include "include/nvgpu/nvgpu_next_mc.h"
 #endif
 
-struct gk20a;
-
 /**
  * @defgroup NVGPU_MC_UNIT_ENUMS
  *
@@ -501,10 +501,4 @@ void nvgpu_mc_intr_nonstall_pause(struct gk20a *g);
  */
 void nvgpu_mc_intr_nonstall_resume(struct gk20a *g);
 
-#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
-void nvgpu_mc_intr_unit_vectorid_init(struct gk20a *g, u32 unit,
-		u32 *vectorid, u32 num_entries);
-bool nvgpu_mc_intr_is_unit_info_valid(struct gk20a *g, u32 unit);
-#endif
-
 #endif