summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorVishal Annapurve <vannapurve@nvidia.com>2016-03-04 11:01:01 -0500
committerSandeep Trasi <strasi@nvidia.com>2016-03-29 05:00:58 -0400
commitcd29c45e673cb0ed8e69630dde684bf96c3c78e0 (patch)
tree15e29617f5e2ce8e726e9dd3f43e830faa60437d /drivers
parentfbc21ed2ee1859dfe1814914a7b9367eee6b9f3d (diff)
gpu: nvgpu: Fix compilation with CONFIG_DEBUG_FS disabled
This change fixes issues with kernel compilation when CONFIG_DEBUG_FS is disabled. Bug 1737085 Change-Id: I74719674d07ae071e3df99b0dda249b54173f40b Signed-off-by: Vishal Annapurve <vannapurve@nvidia.com> Reviewed-on: http://git-master/r/1024167 GVS: Gerrit_Virtual_Submit Reviewed-by: Sandeep Trasi <strasi@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c2
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.h2
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 08f1d921..a10650be 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -7485,6 +7485,7 @@ static int gr_gk20a_dump_gr_status_regs(struct gk20a *g,
7485 return 0; 7485 return 0;
7486} 7486}
7487 7487
7488#ifdef CONFIG_DEBUG_FS
7488int gr_gk20a_debugfs_init(struct gk20a *g) 7489int gr_gk20a_debugfs_init(struct gk20a *g)
7489{ 7490{
7490 struct gk20a_platform *platform = platform_get_drvdata(g->dev); 7491 struct gk20a_platform *platform = platform_get_drvdata(g->dev);
@@ -7496,6 +7497,7 @@ int gr_gk20a_debugfs_init(struct gk20a *g)
7496 7497
7497 return 0; 7498 return 0;
7498} 7499}
7500#endif
7499 7501
7500static void gr_gk20a_init_cyclestats(struct gk20a *g) 7502static void gr_gk20a_init_cyclestats(struct gk20a *g)
7501{ 7503{
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index b151c180..368b32d3 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -337,9 +337,9 @@ struct mm_gk20a {
337#ifdef CONFIG_DEBUG_FS 337#ifdef CONFIG_DEBUG_FS
338 u32 ltc_enabled; 338 u32 ltc_enabled;
339 u32 ltc_enabled_debug; 339 u32 ltc_enabled_debug;
340#endif
340 u32 bypass_smmu; 341 u32 bypass_smmu;
341 u32 disable_bigpage; 342 u32 disable_bigpage;
342#endif
343}; 343};
344 344
345int gk20a_mm_init(struct mm_gk20a *mm); 345int gk20a_mm_init(struct mm_gk20a *mm);
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 30592ee2..60c87979 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -4426,7 +4426,7 @@ int gk20a_aelpg_init_and_enable(struct gk20a *g, u8 ctrl_id)
4426 return status; 4426 return status;
4427} 4427}
4428 4428
4429#if CONFIG_DEBUG_FS 4429#ifdef CONFIG_DEBUG_FS
4430static int elpg_residency_show(struct seq_file *s, void *data) 4430static int elpg_residency_show(struct seq_file *s, void *data)
4431{ 4431{
4432 struct gk20a *g = s->private; 4432 struct gk20a *g = s->private;