summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/pci.c
diff options
context:
space:
mode:
authorDavid Pu <dpu@nvidia.com>2016-06-18 05:01:11 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-06-22 15:41:57 -0400
commitcfb067b6d7e28a1d202f6efe437c080f474d81dd (patch)
treef8b200918254b815b61ef091450ee53ae1b7c790 /drivers/gpu/nvgpu/pci.c
parent344d665119964435583c12cbff8338037d82466c (diff)
gpu: nvgpu: fix issue with CONFIG_DEBUG_FS=n
following compilation error are reported with CONFIG_DEBUG_FS=n: pci.c:246:7: error: 'struct mm_gk20a' has no member named 'ltc_enabled' pci.c:247:7: error: 'struct mm_gk20a' has no member named 'ltc_enabled_debug' possible compilation error(reported sometime): gk20a_allocator.c:1163:13: error: 'gk20a_alloc_debugfs_init' defined but not used fixed by adding '#ifdef CONFIG_DEBUG_FS' for debug only code. following variables from gk20a.c are not initialized from CONFIG_DEBUG_FS=n path, it will cause kernel oops when booting: gk20a->mm.bypass_smmu = platform->bypass_smmu; gk20a->mm.disable_bigpage = platform->disable_bigpage; gk20a->mm.has_physical_mode = true; fix it by move them out from '#ifdef CONFIG_DEBUG_FS' section. Bug 1778001 Change-Id: Ic2da36b3f500882748ee46a5150903244b697761 Signed-off-by: David Pu <dpu@nvidia.com> Reviewed-on: http://git-master/r/1167358 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/pci.c')
-rw-r--r--drivers/gpu/nvgpu/pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/pci.c b/drivers/gpu/nvgpu/pci.c
index a899c0cf..01c7a2dc 100644
--- a/drivers/gpu/nvgpu/pci.c
+++ b/drivers/gpu/nvgpu/pci.c
@@ -243,8 +243,10 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
243 243
244 g->mm.has_physical_mode = false; 244 g->mm.has_physical_mode = false;
245 g->mm.vidmem_is_vidmem = true; 245 g->mm.vidmem_is_vidmem = true;
246#ifdef CONFIG_DEBUG_FS
246 g->mm.ltc_enabled = true; 247 g->mm.ltc_enabled = true;
247 g->mm.ltc_enabled_debug = true; 248 g->mm.ltc_enabled_debug = true;
249#endif
248 g->mm.bypass_smmu = platform->bypass_smmu; 250 g->mm.bypass_smmu = platform->bypass_smmu;
249 g->mm.disable_bigpage = platform->disable_bigpage; 251 g->mm.disable_bigpage = platform->disable_bigpage;
250 252