From 7ac0b046a538daa1a3532d3d5ae7cba1ef3295ba Mon Sep 17 00:00:00 2001
From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Thu, 30 Aug 2018 14:05:16 -0700
Subject: gpu: nvgpu: Move MC HAL to common

Move implementation of MC HAL to common/mc. Also bump gk20a
implementation to gm20b.

gk20a_mc_boot_0 was used via a HAL, but we have only one possible
implementation. It also has to be anyway called directly to detect
which HALs to assign, so make it a true common function.

mc_gk20a_handle_intr_nonstall was also used only in os/linux/intr.c
so move it there.

JIRA NVGPU-954

Change-Id: I79aedc9158f90d578db0edc17b714617b52690ac
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1813519
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 3 ---
 drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 4 ----
 2 files changed, 7 deletions(-)

(limited to 'drivers/gpu/nvgpu/vgpu')

diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index 58f595f4..a90d2d94 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -49,11 +49,9 @@
 #include "vgpu_fuse_gp10b.h"
 
 #include "gk20a/flcn_gk20a.h"
-#include "gk20a/mc_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 
-#include "gp10b/mc_gp10b.h"
 #include "gp10b/mm_gp10b.h"
 #include "gp10b/ce_gp10b.h"
 #include "gp10b/pmu_gp10b.h"
@@ -484,7 +482,6 @@ static const struct gpu_ops vgpu_gp10b_ops = {
 		.enable = NULL,
 		.disable = NULL,
 		.reset = NULL,
-		.boot_0 = NULL,
 		.is_intr1_pending = NULL,
 		.log_pending_intrs = NULL,
 	},
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index 9832a714..3a917bf3 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -54,7 +54,6 @@
 #include "vgpu/gp10b/vgpu_gr_gp10b.h"
 
 #include <gk20a/flcn_gk20a.h>
-#include <gk20a/mc_gk20a.h>
 #include "gk20a/dbg_gpu_gk20a.h"
 #include <gk20a/pmu_gk20a.h>
 
@@ -66,7 +65,6 @@
 
 #include <gp10b/pmu_gp10b.h>
 #include <gp10b/mm_gp10b.h>
-#include <gp10b/mc_gp10b.h>
 #include <gp10b/ce_gp10b.h>
 #include "gp10b/gr_gp10b.h"
 #include <gp10b/fifo_gp10b.h>
@@ -77,7 +75,6 @@
 #include <gv11b/pmu_gv11b.h>
 #include <gv11b/acr_gv11b.h>
 #include <gv11b/mm_gv11b.h>
-#include <gv11b/mc_gv11b.h>
 #include <gv11b/ce_gv11b.h>
 #include <gv11b/fifo_gv11b.h>
 #include <gv11b/regops_gv11b.h>
@@ -553,7 +550,6 @@ static const struct gpu_ops vgpu_gv11b_ops = {
 		.enable = NULL,
 		.disable = NULL,
 		.reset = NULL,
-		.boot_0 = NULL,
 		.is_intr1_pending = NULL,
 		.is_intr_hub_pending = NULL,
 		.log_pending_intrs = NULL	,
-- 
cgit v1.2.2