diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv100.c b/drivers/gpu/nvgpu/common/fb/fb_gv100.c
index 91ae0850b..b98aad8fc 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv100.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c
@@ -210,7 +210,8 @@ int gv100_fb_memory_unlock(struct gk20a *g)
 	/* Write non-zero value to mailbox register which is updated by
 	 * mem_unlock bin to denote its return status.
 	 */
-	nvgpu_falcon_mailbox_write(&g->nvdec_flcn, 0, 0xdeadbeef);
+	nvgpu_falcon_mailbox_write(&g->nvdec_flcn,
+		FALCON_MAILBOX_0, 0xdeadbeef);
 
 	/* set BOOTVEC to start of non-secure code */
 	nvgpu_falcon_bootstrap(&g->nvdec_flcn, 0);
@@ -219,7 +220,7 @@ int gv100_fb_memory_unlock(struct gk20a *g)
 	nvgpu_falcon_wait_for_halt(&g->nvdec_flcn, MEM_UNLOCK_TIMEOUT);
 
 	/* check mem unlock status */
-	val = nvgpu_falcon_mailbox_read(&g->nvdec_flcn, 0);
+	val = nvgpu_falcon_mailbox_read(&g->nvdec_flcn, FALCON_MAILBOX_0);
 	if (val != 0U) {
 		nvgpu_err(g, "memory unlock failed, err %x", val);
 		nvgpu_falcon_dump_stats(&g->nvdec_flcn);