gpu: nvgpu: vgpu: flatten out vgpu hal

Instead of calling the native HAL init function then adding
multiple layers of modification for VGPU, flatten out the sequence
so that all entry points are set statically and visible in a
single file.

JIRA ESRM-30

Change-Id: Ie424abb48bce5038874851d399baac5e4bb7d27c
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1574616
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 20 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.h b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.h
index d20de773..392b344c 100644
--- a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.h
+++ b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * 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"),
@@ -23,8 +23,25 @@
 #ifndef __FECS_TRACE_VGPU_H
 #define __FECS_TRACE_VGPU_H
 
-struct gpu_ops;
-void vgpu_init_fecs_trace_ops(struct gpu_ops *ops);
+#include <nvgpu/types.h>
+
+struct gk20a;
+struct vm_area_struct;
+struct nvgpu_ctxsw_trace_filter;
+
 void vgpu_fecs_trace_data_update(struct gk20a *g);
+int vgpu_fecs_trace_init(struct gk20a *g);
+int vgpu_fecs_trace_deinit(struct gk20a *g);
+int vgpu_fecs_trace_enable(struct gk20a *g);
+int vgpu_fecs_trace_disable(struct gk20a *g);
+bool vgpu_fecs_trace_is_enabled(struct gk20a *g);
+int vgpu_fecs_trace_poll(struct gk20a *g);
+int vgpu_alloc_user_buffer(struct gk20a *g, void **buf, size_t *size);
+int vgpu_free_user_buffer(struct gk20a *g);
+int vgpu_mmap_user_buffer(struct gk20a *g, struct vm_area_struct *vma);
+int vgpu_fecs_trace_max_entries(struct gk20a *g,
+                        struct nvgpu_ctxsw_trace_filter *filter);
+int vgpu_fecs_trace_set_filter(struct gk20a *g,
+                        struct nvgpu_ctxsw_trace_filter *filter);
 
 #endif /* __FECS_TRACE_VGPU_H */