From cd29c45e673cb0ed8e69630dde684bf96c3c78e0 Mon Sep 17 00:00:00 2001 From: Vishal Annapurve Date: Fri, 4 Mar 2016 21:31:01 +0530 Subject: 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 Reviewed-on: http://git-master/r/1024167 GVS: Gerrit_Virtual_Submit Reviewed-by: Sandeep Trasi --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 ++ drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 2 +- drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers') 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, return 0; } +#ifdef CONFIG_DEBUG_FS int gr_gk20a_debugfs_init(struct gk20a *g) { struct gk20a_platform *platform = platform_get_drvdata(g->dev); @@ -7496,6 +7497,7 @@ int gr_gk20a_debugfs_init(struct gk20a *g) return 0; } +#endif static void gr_gk20a_init_cyclestats(struct gk20a *g) { 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 { #ifdef CONFIG_DEBUG_FS u32 ltc_enabled; u32 ltc_enabled_debug; +#endif u32 bypass_smmu; u32 disable_bigpage; -#endif }; int 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) return status; } -#if CONFIG_DEBUG_FS +#ifdef CONFIG_DEBUG_FS static int elpg_residency_show(struct seq_file *s, void *data) { struct gk20a *g = s->private; -- cgit v1.2.2