1 files changed, 28 insertions, 108 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h
index eafe503c..66d993fc 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h
@@ -1,6 +1,4 @@
 /*
- * Virtualized GPU Interfaces
- *
  * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -16,24 +14,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _VIRT_H_
-#define _VIRT_H_
+#ifndef __VGPU_COMMON_H__
+#define __VGPU_COMMON_H__
+
+#include <nvgpu/types.h>
+#include <nvgpu/thread.h>
+#include <nvgpu/log.h>
+#include <nvgpu/vgpu/tegra_vgpu.h>
 
 struct device;
 struct tegra_vgpu_gr_intr_info;
 struct tegra_vgpu_fifo_intr_info;
 struct tegra_vgpu_cmd_msg;
-struct gk20a_platform;
 struct nvgpu_mem;
-
-#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
-#include <nvgpu/vgpu/vgpu_ivc.h>
-#include <nvgpu/vgpu/tegra_vgpu.h>
-#include <nvgpu/thread.h>
-
-#include "gk20a/gk20a.h"
-#include "common/linux/platform_gk20a.h"
-#include "common/linux/os_linux.h"
+struct gk20a;
+struct vm_gk20a;
+struct nvgpu_gr_ctx;
+struct nvgpu_cpu_time_correlation_sample;
 
 struct vgpu_priv_data {
         u64 virt_handle;
@@ -41,18 +38,7 @@ struct vgpu_priv_data {
         struct tegra_vgpu_constants_params constants;
 };
 
-static inline
-struct vgpu_priv_data *vgpu_get_priv_data_from_dev(struct device *dev)
-{
-        struct gk20a_platform *plat = gk20a_get_platform(dev);
-
-        return (struct vgpu_priv_data *)plat->vgpu_priv;
-}
-
-static inline struct vgpu_priv_data *vgpu_get_priv_data(struct gk20a *g)
-{
-        return vgpu_get_priv_data_from_dev(dev_from_gk20a(g));
-}
+struct vgpu_priv_data *vgpu_get_priv_data(struct gk20a *g);
 
 static inline u64 vgpu_get_handle(struct gk20a *g)
 {
@@ -66,10 +52,22 @@ static inline u64 vgpu_get_handle(struct gk20a *g)
         return priv->virt_handle;
 }
 
-int vgpu_pm_prepare_poweroff(struct device *dev);
-int vgpu_pm_finalize_poweron(struct device *dev);
-int vgpu_probe(struct platform_device *dev);
-int vgpu_remove(struct platform_device *dev);
+int vgpu_comm_init(struct gk20a *g);
+void vgpu_comm_deinit(void);
+int vgpu_comm_sendrecv(struct tegra_vgpu_cmd_msg *msg, size_t size_in,
+                size_t size_out);
+u64 vgpu_connect(void);
+int vgpu_get_attribute(u64 handle, u32 attrib, u32 *value);
+int vgpu_intr_thread(void *dev_id);
+void vgpu_remove_support_common(struct gk20a *g);
+void vgpu_detect_chip(struct gk20a *g);
+int vgpu_init_gpu_characteristics(struct gk20a *g);
+int vgpu_read_ptimer(struct gk20a *g, u64 *value);
+int vgpu_get_timestamps_zipper(struct gk20a *g,
+                u32 source_id, u32 count,
+                struct nvgpu_cpu_time_correlation_sample *samples);
+int vgpu_init_hal(struct gk20a *g);
+int vgpu_get_constants(struct gk20a *g);
 u64 vgpu_bar1_map(struct gk20a *g, struct nvgpu_mem *mem);
 int vgpu_gr_isr(struct gk20a *g, struct tegra_vgpu_gr_intr_info *info);
 int vgpu_gr_nonstall_isr(struct gk20a *g,
@@ -94,90 +92,12 @@ int vgpu_init_mm_support(struct gk20a *g);
 int vgpu_init_gr_support(struct gk20a *g);
 int vgpu_init_fifo_support(struct gk20a *g);
 
-int vgpu_get_attribute(u64 handle, u32 attrib, u32 *value);
-int vgpu_comm_sendrecv(struct tegra_vgpu_cmd_msg *msg, size_t size_in,
-                size_t size_out);
-
 int vgpu_gp10b_init_hal(struct gk20a *g);
 int vgpu_gv11b_init_hal(struct gk20a *g);
 
-int vgpu_init_gpu_characteristics(struct gk20a *g);
-
-void vgpu_create_sysfs(struct device *dev);
-void vgpu_remove_sysfs(struct device *dev);
 int vgpu_read_ptimer(struct gk20a *g, u64 *value);
 int vgpu_get_timestamps_zipper(struct gk20a *g,
                 u32 source_id, u32 count,
                 struct nvgpu_cpu_time_correlation_sample *samples);
-#else
-static inline int vgpu_pm_prepare_poweroff(struct device *dev)
-{
-        return -ENOSYS;
-}
-static inline int vgpu_pm_finalize_poweron(struct device *dev)
-{
-        return -ENOSYS;
-}
-static inline int vgpu_probe(struct platform_device *dev)
-{
-        return -ENOSYS;
-}
-static inline int vgpu_remove(struct platform_device *dev)
-{
-        return -ENOSYS;
-}
-static inline u64 vgpu_bar1_map(struct gk20a *g, struct nvgpu_mem *mem)
-{
-        return 0;
-}
-static inline int vgpu_gr_isr(struct gk20a *g,
-                        struct tegra_vgpu_gr_intr_info *info)
-{
-        return 0;
-}
-static inline int vgpu_gr_alloc_gr_ctx(struct gk20a *g,
-                                struct nvgpu_gr_ctx *gr_ctx,
-                                struct vm_gk20a *vm,
-                                u32 class,
-                                u32 flags)
-{
-        return -ENOSYS;
-}
-static inline void vgpu_gr_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
-                                struct nvgpu_gr_ctx *gr_ctx)
-{
-}
-static inline int vgpu_gr_init_ctx_state(struct gk20a *g)
-{
-        return -ENOSYS;
-}
-static inline int vgpu_fifo_isr(struct gk20a *g,
-                        struct tegra_vgpu_fifo_intr_info *info)
-{
-        return 0;
-}
-static inline int vgpu_init_mm_support(struct gk20a *g)
-{
-        return -ENOSYS;
-}
-static inline int vgpu_init_gr_support(struct gk20a *g)
-{
-        return -ENOSYS;
-}
-static inline int vgpu_init_fifo_support(struct gk20a *g)
-{
-        return -ENOSYS;
-}
-
-static inline int vgpu_get_attribute(u64 handle, u32 attrib, u32 *value)
-{
-        return -ENOSYS;
-}
-static inline int vgpu_comm_sendrecv(struct tegra_vgpu_cmd_msg *msg, size_t size_in,
-                size_t size_out)
-{
-        return -ENOSYS;
-}
-#endif
 
 #endif