diff --git a/drivers/gpu/nvgpu/hal/fifo/usermode_tu104.c b/drivers/gpu/nvgpu/hal/fifo/usermode_tu104.c
index 92728381c..71e73fe6b 100644
--- a/drivers/gpu/nvgpu/hal/fifo/usermode_tu104.c
+++ b/drivers/gpu/nvgpu/hal/fifo/usermode_tu104.c
@@ -25,6 +25,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
+#include <nvgpu/io_usermode.h>
 
 #include "usermode_tu104.h"
 
@@ -34,7 +35,7 @@
 
 u64 tu104_usermode_base(struct gk20a *g)
 {
-	return usermode_cfg0_r();
+	return func_cfg0_r();
 }
 
 u64 tu104_usermode_bus_base(struct gk20a *g)
@@ -66,6 +67,6 @@ void tu104_usermode_ring_doorbell(struct nvgpu_channel *ch)
 	nvgpu_log_info(ch->g, "channel ring door bell %d, runlist %d",
 			ch->chid, ch->runlist_id);
 
-	nvgpu_func_writel(ch->g, func_doorbell_r(),
-			tu104_usermode_doorbell_token(ch));
+	nvgpu_usermode_writel(ch->g, func_doorbell_r(),
+				ch->g->ops.usermode.doorbell_token(ch));
 }
diff --git a/drivers/gpu/nvgpu/os/linux/module_usermode.c b/drivers/gpu/nvgpu/os/linux/module_usermode.c
index afd662520..2babce43f 100644
--- a/drivers/gpu/nvgpu/os/linux/module_usermode.c
+++ b/drivers/gpu/nvgpu/os/linux/module_usermode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2020, 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,
@@ -60,7 +60,7 @@ void nvgpu_init_usermode_support(struct gk20a *g)
 	}
 
 	if (l->usermode_regs == NULL) {
-		l->usermode_regs = l->regs + g->ops.usermode.base(g);
+		l->usermode_regs = l->regs + g->ops.usermode.bus_base(g);
 		l->usermode_regs_saved = l->usermode_regs;
 	}