diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 0ebf2db97..3f5c4b4f5 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -1377,8 +1377,7 @@ int gr_gk20a_init_fs_state(struct gk20a *g)
 	}
 
 	/* gr__setup_pd_mapping stubbed for gk20a */
-	if (g->ops.gr.setup_rop_mapping)
-		g->ops.gr.setup_rop_mapping(g, gr);
+	g->ops.gr.setup_rop_mapping(g, gr);
 	if (g->ops.gr.setup_alpha_beta_tables)
 		g->ops.gr.setup_alpha_beta_tables(g, gr);
 
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index cff0774dd..e71ca4a3f 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -1586,6 +1586,7 @@ void gm20b_init_gr(struct gpu_ops *gops)
 	gops->gr.is_ltcn_ltss_addr = gr_gm20b_is_ltcn_ltss_addr;
 	gops->gr.split_lts_broadcast_addr = gr_gm20b_split_lts_broadcast_addr;
 	gops->gr.split_ltc_broadcast_addr = gr_gm20b_split_ltc_broadcast_addr;
+	gops->gr.setup_rop_mapping = gr_gk20a_setup_rop_mapping;
 	gops->gr.program_zcull_mapping = gr_gk20a_program_zcull_mapping;
 	gops->gr.commit_global_timeslice = gr_gk20a_commit_global_timeslice;
 }