diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index e8c89db8a..04f6583a4 100644
--- a/drivers/gpu/nvgpu/common/fifo/channel.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -2085,10 +2085,6 @@ static int channel_setup_ramfc(struct nvgpu_channel *c,
 	if (c->wdt.enabled && nvgpu_is_timeouts_enabled(c->g)) {
 		pbdma_acquire_timeout = c->wdt.limit_ms;
 	}
-#else
-	if (nvgpu_is_timeouts_enabled(c->g)) {
-		pbdma_acquire_timeout = g->ch_wdt_init_limit_ms;
-	}
 #endif
 
 	err = g->ops.ramfc.setup(c, gpfifo_gpu_va, gpfifo_size,
diff --git a/drivers/gpu/nvgpu/hal/fifo/ramfc_gv11b_fusa.c b/drivers/gpu/nvgpu/hal/fifo/ramfc_gv11b_fusa.c
index 4ffe7af76..e64d1c498 100644
--- a/drivers/gpu/nvgpu/hal/fifo/ramfc_gv11b_fusa.c
+++ b/drivers/gpu/nvgpu/hal/fifo/ramfc_gv11b_fusa.c
@@ -50,6 +50,9 @@ int gv11b_ramfc_setup(struct nvgpu_channel *ch, u64 gpfifo_base,
 	}
 #endif
 
+	nvgpu_log_info(g, "%llu %u", pbdma_acquire_timeout,
+		g->ops.pbdma.acquire_val(pbdma_acquire_timeout));
+
 	g->ops.ramin.init_subctx_pdb(g, mem, ch->vm->pdb.mem, replayable);
 
 	nvgpu_mem_wr32(g, mem, ram_fc_gp_base_w(),