1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/common/fifo/submit.c b/drivers/gpu/nvgpu/common/fifo/submit.c
index f6a79f80..00763036 100644
--- a/drivers/gpu/nvgpu/common/fifo/submit.c
+++ b/drivers/gpu/nvgpu/common/fifo/submit.c
@@ -368,7 +368,8 @@ static int nvgpu_submit_channel_gpfifo(struct channel_gk20a *c,
         need_job_tracking = (flags & NVGPU_SUBMIT_FLAGS_FENCE_WAIT) ||
                         (flags & NVGPU_SUBMIT_FLAGS_FENCE_GET) ||
                         c->timeout.enabled ||
-                        (g->can_railgate && !c->deterministic) ||
+                        (nvgpu_is_enabled(g, NVGPU_CAN_RAILGATE)
+                         && !c->deterministic) ||
                         !skip_buffer_refcounting;
 
         if (need_job_tracking) {
@@ -405,7 +406,7 @@ static int nvgpu_submit_channel_gpfifo(struct channel_gk20a *c,
                 need_deferred_cleanup = !c->deterministic ||
                                         need_sync_framework ||
                                         c->timeout.enabled ||
-                                        (g->can_railgate &&
+                                        (nvgpu_is_enabled(g, NVGPU_CAN_RAILGATE) &&
                                          !c->deterministic) ||
                                         !skip_buffer_refcounting;