gpu: nvgpu: created os-agnostic sim header.

added a os-agnostic sim.h header which could be
included in by any platform, moved out os specific
headers to nvgpu/linux.

JIRA VQRM-2368

Change-Id: I3861bfa75a6b8d2d909bc7223467fd68c208275b
Signed-off-by: Antony Clince Alex <aalex@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1702816
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 2 insertions, 47 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 7e1e751b..aac3380e 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -63,13 +63,13 @@ struct nvgpu_ctxsw_trace_filter;
 #include <nvgpu/rwsem.h>
 #include <nvgpu/clk_arb.h>
 #include <nvgpu/nvlink.h>
+#include <nvgpu/sim.h>
 
 #include "clk_gk20a.h"
 #include "ce2_gk20a.h"
 #include "fifo_gk20a.h"
 #include "tsg_gk20a.h"
 #include "gr_gk20a.h"
-#include "sim_gk20a.h"
 #include "pmu_gk20a.h"
 #include "priv_ring_gk20a.h"
 #include "therm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a_sim.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a_sim.c
index 146b0e22..9674e2d6 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a_sim.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a_sim.c
@@ -25,7 +25,7 @@
  */
 
 #include "gk20a.h"
-#include "sim_gk20a.h"
+#include <nvgpu/sim.h>
 #include "gr_ctx_gk20a.h"
 
 #include <nvgpu/log.h>
diff --git a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
deleted file mode 100644
index e74d33d5..00000000
--- a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * drivers/video/tegra/host/gk20a/sim_gk20a.h
- *
- * GK20A sim support
- *
- * Copyright (c) 2013-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.
- */
-#ifndef __SIM_GK20A_H__
-#define __SIM_GK20A_H__
-
-struct gk20a;
-
-struct sim_nvgpu {
-        struct gk20a *g;
-        u32 send_ring_put;
-        u32 recv_ring_get;
-        u32 recv_ring_put;
-        u32 sequence_base;
-        struct nvgpu_mem send_bfr;
-        struct nvgpu_mem recv_bfr;
-        struct nvgpu_mem msg_bfr;
-        void (*remove_support)(struct gk20a *);
-        int (*esc_readl)(
-                struct gk20a *g, char *path, u32 index, u32 *data);
-};
-
-#endif /*__SIM_GK20A_H__*/