1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index 015046dd..2475912a 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -168,8 +168,12 @@ static void nvgpu_init_pm_vars(struct gk20a *g)
         g->ptimer_src_freq = platform->ptimer_src_freq;
         g->support_pmu = support_gk20a_pmu(dev_from_gk20a(g));
         g->can_railgate = platform->can_railgate_init;
-        g->railgate_delay = platform->railgate_delay_init;
         g->ldiv_slowdown_factor = platform->ldiv_slowdown_factor_init;
+        /* if default delay is not set, set default delay to 500msec */
+        if (platform->railgate_delay_init)
+                g->railgate_delay = platform->railgate_delay_init;
+        else
+                g->railgate_delay = NVGPU_DEFAULT_RAILGATE_IDLE_TIMEOUT;
         __nvgpu_set_enabled(g, NVGPU_PMU_PERFMON, platform->enable_perfmon);
 
         /* set default values to aelpg parameters */