diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index f88b12cf1..9ad758465 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -239,7 +239,13 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g)
 
 	f->g = g;
 	f->num_channels = priv->constants.num_channels;
+
+	/*
+	 * This is not the HW format you're looking for (see
+	 * vgpu_fifo_update_runlist_locked(), vgpu_submit_runlist())
+	 */
 	f->runlist_entry_size = (u32)sizeof(u16);
+
 	f->num_runlist_entries = f->num_channels;
 	f->max_engines = nvgpu_get_litter_value(g, GPU_LIT_HOST_NUM_ENGINES);
 
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index 927b2475b..87f2606a9 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -430,7 +430,7 @@ static const struct gpu_ops vgpu_gp10b_ops = {
 		.update_runlist = vgpu_fifo_update_runlist,
 		.set_runlist_interleave = vgpu_fifo_set_runlist_interleave,
 		.eng_runlist_base_size = gk20a_fifo_runlist_base_size,
-		.runlist_entry_size = gk20a_fifo_runlist_entry_size,
+		.runlist_entry_size = NULL,
 		.get_tsg_runlist_entry = gk20a_get_tsg_runlist_entry,
 		.get_ch_runlist_entry = gk20a_get_ch_runlist_entry,
 		.runlist_hw_submit = NULL,
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index 40ac79f1e..c18ee4cf2 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -508,7 +508,7 @@ static const struct gpu_ops vgpu_gv11b_ops = {
 		.update_runlist = vgpu_fifo_update_runlist,
 		.set_runlist_interleave = vgpu_fifo_set_runlist_interleave,
 		.eng_runlist_base_size = gv11b_fifo_runlist_base_size,
-		.runlist_entry_size = gv11b_fifo_runlist_entry_size,
+		.runlist_entry_size = NULL,
 		.get_tsg_runlist_entry = gv11b_get_tsg_runlist_entry,
 		.get_ch_runlist_entry = gv11b_get_ch_runlist_entry,
 		.runlist_hw_submit = NULL,