gpu: nvgpu: Move debugfs fields to os_linux

Move all Linux specific debugfs dentry fields to struct
nvgpu_os_linux.

JIRA NVGPU-62

Change-Id: I615620005f5d042943dd2e478c1629bcc912c550
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1528263
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 6 insertions, 27 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index 84bf20b8..5ee90440 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -27,7 +27,6 @@
 #include "fecs_trace_gk20a.h"
 #include "gk20a.h"
 #include "gr_gk20a.h"
-#include "platform_gk20a.h"
 #include "common/linux/os_linux.h"
 
 #include <nvgpu/log.h>
@@ -537,21 +536,21 @@ DEFINE_SIMPLE_ATTRIBUTE(gk20a_fecs_trace_debugfs_write_fops,
 
 static void gk20a_fecs_trace_debugfs_init(struct gk20a *g)
 {
-        struct gk20a_platform *plat = dev_get_drvdata(dev_from_gk20a(g));
+        struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
 
-        debugfs_create_file("ctxsw_trace_read", 0600, plat->debugfs, g,
+        debugfs_create_file("ctxsw_trace_read", 0600, l->debugfs, g,
                 &gk20a_fecs_trace_debugfs_read_fops);
-        debugfs_create_file("ctxsw_trace_write", 0600, plat->debugfs, g,
+        debugfs_create_file("ctxsw_trace_write", 0600, l->debugfs, g,
                 &gk20a_fecs_trace_debugfs_write_fops);
-        debugfs_create_file("ctxsw_trace_ring", 0600, plat->debugfs, g,
+        debugfs_create_file("ctxsw_trace_ring", 0600, l->debugfs, g,
                 &gk20a_fecs_trace_debugfs_ring_fops);
 }
 
 static void gk20a_fecs_trace_debugfs_cleanup(struct gk20a *g)
 {
-        struct gk20a_platform *plat = dev_get_drvdata(dev_from_gk20a(g));
+        struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
 
-        debugfs_remove_recursive(plat->debugfs);
+        debugfs_remove_recursive(l->debugfs);
 }
 
 #else
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index f7b714f2..83cdeb3f 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -1147,22 +1147,6 @@ struct gk20a {
 
         struct nvgpu_spinlock ltc_enabled_lock;
 
-#ifdef CONFIG_DEBUG_FS
-        struct dentry *debugfs_ltc_enabled;
-        struct dentry *debugfs_timeouts_enabled;
-        struct dentry *debugfs_gr_idle_timeout_default;
-        struct dentry *debugfs_bypass_smmu;
-        struct dentry *debugfs_disable_bigpage;
-        struct dentry *debugfs_gr_default_attrib_cb_size;
-
-        struct dentry *debugfs_timeslice_low_priority_us;
-        struct dentry *debugfs_timeslice_medium_priority_us;
-        struct dentry *debugfs_timeslice_high_priority_us;
-        struct dentry *debugfs_runlist_interleave;
-        struct dentry *debugfs_allocators;
-        struct dentry *debugfs_xve;
-        struct dentry *debugfs_kmem;
-#endif
         struct gk20a_ctxsw_ucode_info ctxsw_ucode_info;
 
         /*
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
index 17c3f9a4..791286f0 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
@@ -61,10 +61,6 @@ struct gk20a_platform {
         /* Set if the platform can unify the small/large address spaces. */
         bool unify_address_spaces;
 
-        /* Should be populated by probe. */
-        struct dentry *debugfs;
-        struct dentry *debugfs_alias;
-
         /* Clock configuration is stored here. Platform probe is responsible
          * for filling this data. */
         struct clk *clk[GK20A_CLKS_MAX];