diff --git a/drivers/gpu/nvgpu/os/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c
index 93b8d52fe..9a4e6fd18 100644
--- a/drivers/gpu/nvgpu/os/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/os/linux/driver_common.c
@@ -219,8 +219,11 @@ static void nvgpu_init_pm_vars(struct gk20a *g)
 		platform->devfreq_governor = NULL;
 		platform->qos_notify = NULL;
 	} else {
+		/* Always enable railgating on simulation platform */
+		platform->can_railgate_init = nvgpu_platform_is_simulation(g) ?
+			true : platform->can_railgate_init;
 		nvgpu_set_enabled(g, NVGPU_CAN_RAILGATE,
-			nvgpu_platform_is_simulation(g) ? true : platform->can_railgate_init);
+				platform->can_railgate_init);
 	}
 #ifdef CONFIG_NVGPU_STATIC_POWERGATE
 	g->can_tpc_pg = platform->can_tpc_pg;
diff --git a/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
index 1040fddb5..caa6e4d6d 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
@@ -1,7 +1,7 @@
 /*
  * GA10B Tegra Platform Interface
  *
- * Copyright (c) 2016-2021, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2022, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -622,7 +622,7 @@ struct gk20a_platform ga10b_tegra_platform = {
 	.late_probe = ga10b_tegra_late_probe,
 	.remove = ga10b_tegra_remove,
 	.railgate_delay_init    = 500,
-	.can_railgate_init      = false,
+	.can_railgate_init      = true,
 
 #ifdef CONFIG_NVGPU_STATIC_POWERGATE
 	/* add tpc powergate JIRA NVGPU-4683 */