diff --git a/drivers/gpu/nvgpu/hal/gr/init/gr_init_tu104.c b/drivers/gpu/nvgpu/hal/gr/init/gr_init_tu104.c
index 0abd01417..2a483f301 100644
--- a/drivers/gpu/nvgpu/hal/gr/init/gr_init_tu104.c
+++ b/drivers/gpu/nvgpu/hal/gr/init/gr_init_tu104.c
@@ -158,8 +158,10 @@ int tu104_gr_init_load_sw_bundle64(struct gk20a *g,
 		if (gr_pipe_bundle_address_value_v(sw_bundle64_init->l[i].addr)
 				== GR_GO_IDLE_BUNDLE) {
 			err = g->ops.gr.init.wait_idle(g);
-		} else if (nvgpu_platform_is_silicon(g)) {
-			err = g->ops.gr.init.wait_fe_idle(g);
+		} else {
+			if (nvgpu_platform_is_silicon(g)) {
+				err = g->ops.gr.init.wait_fe_idle(g);
+			}
 		}
 		if (err != 0) {
 			break;