diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index ac506a345..535de8514 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -270,6 +270,11 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g)
 		goto clean_up;
 	}
 
+       /* if reduced BAR1 range is specified, use offset of 0
+          (server returns offset assuming full BAR1 range) */
+       if (resource_size(g->bar1_mem) == (resource_size_t)f->userd.size)
+		f->userd.gpu_va = 0;
+
 	gk20a_dbg(gpu_dbg_map, "userd bar1 va = 0x%llx", f->userd.gpu_va);
 
 	f->channel = kzalloc(f->num_channels * sizeof(*f->channel),
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 90197ab45..78492d3b2 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -199,6 +199,7 @@ static int vgpu_init_support(struct platform_device *pdev)
 		err = PTR_ERR(g->bar1);
 		goto fail;
 	}
+	g->bar1_mem = r;
 
 	mutex_init(&g->dbg_sessions_lock);
 	mutex_init(&g->client_lock);