diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 13 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 16 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 4 |
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 @@ | |||
27 | #include "fecs_trace_gk20a.h" | 27 | #include "fecs_trace_gk20a.h" |
28 | #include "gk20a.h" | 28 | #include "gk20a.h" |
29 | #include "gr_gk20a.h" | 29 | #include "gr_gk20a.h" |
30 | #include "platform_gk20a.h" | ||
31 | #include "common/linux/os_linux.h" | 30 | #include "common/linux/os_linux.h" |
32 | 31 | ||
33 | #include <nvgpu/log.h> | 32 | #include <nvgpu/log.h> |
@@ -537,21 +536,21 @@ DEFINE_SIMPLE_ATTRIBUTE(gk20a_fecs_trace_debugfs_write_fops, | |||
537 | 536 | ||
538 | static void gk20a_fecs_trace_debugfs_init(struct gk20a *g) | 537 | static void gk20a_fecs_trace_debugfs_init(struct gk20a *g) |
539 | { | 538 | { |
540 | struct gk20a_platform *plat = dev_get_drvdata(dev_from_gk20a(g)); | 539 | struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); |
541 | 540 | ||
542 | debugfs_create_file("ctxsw_trace_read", 0600, plat->debugfs, g, | 541 | debugfs_create_file("ctxsw_trace_read", 0600, l->debugfs, g, |
543 | &gk20a_fecs_trace_debugfs_read_fops); | 542 | &gk20a_fecs_trace_debugfs_read_fops); |
544 | debugfs_create_file("ctxsw_trace_write", 0600, plat->debugfs, g, | 543 | debugfs_create_file("ctxsw_trace_write", 0600, l->debugfs, g, |
545 | &gk20a_fecs_trace_debugfs_write_fops); | 544 | &gk20a_fecs_trace_debugfs_write_fops); |
546 | debugfs_create_file("ctxsw_trace_ring", 0600, plat->debugfs, g, | 545 | debugfs_create_file("ctxsw_trace_ring", 0600, l->debugfs, g, |
547 | &gk20a_fecs_trace_debugfs_ring_fops); | 546 | &gk20a_fecs_trace_debugfs_ring_fops); |
548 | } | 547 | } |
549 | 548 | ||
550 | static void gk20a_fecs_trace_debugfs_cleanup(struct gk20a *g) | 549 | static void gk20a_fecs_trace_debugfs_cleanup(struct gk20a *g) |
551 | { | 550 | { |
552 | struct gk20a_platform *plat = dev_get_drvdata(dev_from_gk20a(g)); | 551 | struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); |
553 | 552 | ||
554 | debugfs_remove_recursive(plat->debugfs); | 553 | debugfs_remove_recursive(l->debugfs); |
555 | } | 554 | } |
556 | 555 | ||
557 | #else | 556 | #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 { | |||
1147 | 1147 | ||
1148 | struct nvgpu_spinlock ltc_enabled_lock; | 1148 | struct nvgpu_spinlock ltc_enabled_lock; |
1149 | 1149 | ||
1150 | #ifdef CONFIG_DEBUG_FS | ||
1151 | struct dentry *debugfs_ltc_enabled; | ||
1152 | struct dentry *debugfs_timeouts_enabled; | ||
1153 | struct dentry *debugfs_gr_idle_timeout_default; | ||
1154 | struct dentry *debugfs_bypass_smmu; | ||
1155 | struct dentry *debugfs_disable_bigpage; | ||
1156 | struct dentry *debugfs_gr_default_attrib_cb_size; | ||
1157 | |||
1158 | struct dentry *debugfs_timeslice_low_priority_us; | ||
1159 | struct dentry *debugfs_timeslice_medium_priority_us; | ||
1160 | struct dentry *debugfs_timeslice_high_priority_us; | ||
1161 | struct dentry *debugfs_runlist_interleave; | ||
1162 | struct dentry *debugfs_allocators; | ||
1163 | struct dentry *debugfs_xve; | ||
1164 | struct dentry *debugfs_kmem; | ||
1165 | #endif | ||
1166 | struct gk20a_ctxsw_ucode_info ctxsw_ucode_info; | 1150 | struct gk20a_ctxsw_ucode_info ctxsw_ucode_info; |
1167 | 1151 | ||
1168 | /* | 1152 | /* |
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 { | |||
61 | /* Set if the platform can unify the small/large address spaces. */ | 61 | /* Set if the platform can unify the small/large address spaces. */ |
62 | bool unify_address_spaces; | 62 | bool unify_address_spaces; |
63 | 63 | ||
64 | /* Should be populated by probe. */ | ||
65 | struct dentry *debugfs; | ||
66 | struct dentry *debugfs_alias; | ||
67 | |||
68 | /* Clock configuration is stored here. Platform probe is responsible | 64 | /* Clock configuration is stored here. Platform probe is responsible |
69 | * for filling this data. */ | 65 | * for filling this data. */ |
70 | struct clk *clk[GK20A_CLKS_MAX]; | 66 | struct clk *clk[GK20A_CLKS_MAX]; |