diff options
author | Alex Van Brunt <avanbrunt@nvidia.com> | 2016-03-30 18:29:30 -0400 |
---|---|---|
committer | Bharat Nihalani <bnihalani@nvidia.com> | 2016-04-14 09:51:52 -0400 |
commit | a596f0bd6d327ce832adca4ae915529dc0bb0b3b (patch) | |
tree | 40217c92866a2edce9a92bcda962c9e074175a3b /drivers/gpu/nvgpu | |
parent | ccba95757033292d881671e575aed5e0feb61dc3 (diff) |
debugfs: Pass bool pointer to debugfs_create_bool()
Port the change 621a5f7ad9cd1ce7933f1d302067cbd58354173c from kernel.org
to the nvgpu driver.
bug 200187033
Change-Id: I7d742f614161d9d4ed59c4216d7c730d57ef4116
Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com>
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1118397
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 9 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 0887ab5e..db5cb56d 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -33,6 +33,7 @@ struct acr_gm20b; | |||
33 | #include <linux/nvgpu.h> | 33 | #include <linux/nvgpu.h> |
34 | #include <linux/irqreturn.h> | 34 | #include <linux/irqreturn.h> |
35 | #include <linux/tegra-soc.h> | 35 | #include <linux/tegra-soc.h> |
36 | #include <linux/version.h> | ||
36 | 37 | ||
37 | #include "../../../arch/arm/mach-tegra/iomap.h" | 38 | #include "../../../arch/arm/mach-tegra/iomap.h" |
38 | 39 | ||
@@ -559,7 +560,11 @@ struct gk20a { | |||
559 | const struct firmware *pmu_fw; | 560 | const struct firmware *pmu_fw; |
560 | 561 | ||
561 | u32 gr_idle_timeout_default; | 562 | u32 gr_idle_timeout_default; |
563 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) | ||
562 | u32 timeouts_enabled; | 564 | u32 timeouts_enabled; |
565 | #else | ||
566 | bool timeouts_enabled; | ||
567 | #endif | ||
563 | 568 | ||
564 | struct mutex ch_wdt_lock; | 569 | struct mutex ch_wdt_lock; |
565 | 570 | ||
@@ -569,7 +574,11 @@ struct gk20a { | |||
569 | u32 timeslice_low_priority_us; | 574 | u32 timeslice_low_priority_us; |
570 | u32 timeslice_medium_priority_us; | 575 | u32 timeslice_medium_priority_us; |
571 | u32 timeslice_high_priority_us; | 576 | u32 timeslice_high_priority_us; |
577 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) | ||
572 | u32 runlist_interleave; | 578 | u32 runlist_interleave; |
579 | #else | ||
580 | bool runlist_interleave; | ||
581 | #endif | ||
573 | 582 | ||
574 | bool slcg_enabled; | 583 | bool slcg_enabled; |
575 | bool blcg_enabled; | 584 | bool blcg_enabled; |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index 4482a21d..567369bc 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/tegra-soc.h> | 24 | #include <linux/tegra-soc.h> |
25 | #include <linux/vmalloc.h> | 25 | #include <linux/vmalloc.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/version.h> | ||
27 | #include <asm/dma-iommu.h> | 28 | #include <asm/dma-iommu.h> |
28 | #include <asm/cacheflush.h> | 29 | #include <asm/cacheflush.h> |
29 | #include "gk20a_allocator.h" | 30 | #include "gk20a_allocator.h" |
@@ -342,10 +343,19 @@ struct mm_gk20a { | |||
342 | bool use_full_comp_tag_line; | 343 | bool use_full_comp_tag_line; |
343 | #ifdef CONFIG_DEBUG_FS | 344 | #ifdef CONFIG_DEBUG_FS |
344 | u32 ltc_enabled; | 345 | u32 ltc_enabled; |
346 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) | ||
345 | u32 ltc_enabled_debug; | 347 | u32 ltc_enabled_debug; |
348 | #else | ||
349 | bool ltc_enabled_debug; | ||
350 | #endif | ||
346 | #endif | 351 | #endif |
352 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) | ||
347 | u32 bypass_smmu; | 353 | u32 bypass_smmu; |
348 | u32 disable_bigpage; | 354 | u32 disable_bigpage; |
355 | #else | ||
356 | bool bypass_smmu; | ||
357 | bool disable_bigpage; | ||
358 | #endif | ||
349 | bool has_physical_mode; | 359 | bool has_physical_mode; |
350 | }; | 360 | }; |
351 | 361 | ||