From 1d82693cef59917930267f4fa9ecc4ac9c7a3c7b Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Tue, 10 Jul 2018 05:47:36 -0700 Subject: Revert "gpu: nvgpu: disable powergating for kernel-4.14 in gp10b temporarily." This reverts commit 74d786dd1327bafa18b21310ac8d67db4a5614cb. With the recent powergating changes that got merged in k4.14 and by disabling CONFIG_PROVE_LOCKING, we no longer see any issues in T186. The reboots observer earlier have stopped and the status of nvgpu_submit and nvrm_gpu_tests remain the same without causing any more issues Bug 200414723 Change-Id: Iea872612a233cb3d79df772a78fd6349c69323f2 Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/1775199 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'drivers/gpu/nvgpu/os') diff --git a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c index dccc5c3e..d5530368 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c @@ -13,7 +13,6 @@ * more details. */ -#include #include #include #include @@ -416,18 +415,6 @@ struct gk20a_platform gp10b_tegra_platform = { .ldiv_slowdown_factor_init = SLOWDOWN_FACTOR_FPDIV_BY16, /* power management configuration */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) - .can_railgate_init = false, - .enable_elpg = false, - .can_elpg_init = false, - .enable_blcg = false, - .enable_slcg = false, - .enable_elcg = false, - .can_slcg = false, - .can_blcg = false, - .can_elcg = false, - .enable_aelpg = false, -#else .can_railgate_init = true, .enable_elpg = true, .can_elpg_init = true, @@ -438,7 +425,6 @@ struct gk20a_platform gp10b_tegra_platform = { .can_blcg = true, .can_elcg = true, .enable_aelpg = true, -#endif .enable_perfmon = true, /* ptimer src frequency in hz*/ -- cgit v1.2.2