1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c
index b7e031c6..3178ae53 100644
--- a/drivers/gpu/nvgpu/gp106/bios_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c
@@ -135,6 +135,16 @@ out:
         return err;
 }
 
+int gp106_bios_preos_wait_for_halt(struct gk20a *g)
+{
+        int err = 0;
+
+        if (nvgpu_flcn_wait_for_halt(g->pmu.flcn, PMU_BOOT_TIMEOUT_MAX / 1000))
+                err = -ETIMEDOUT;
+
+        return err;
+}
+
 static int gp106_bios_preos(struct gk20a *g)
 {
         int err = 0;
@@ -146,6 +156,9 @@ static int gp106_bios_preos(struct gk20a *g)
                 goto out;
         }
 
+        if (g->ops.bios.preos_reload_check)
+                g->ops.bios.preos_reload_check(g);
+
         upload_code(g, g->bios.preos.bootloader_phys_base,
                         g->bios.preos.bootloader,
                         g->bios.preos.bootloader_size,
@@ -161,11 +174,7 @@ static int gp106_bios_preos(struct gk20a *g)
 
         nvgpu_flcn_bootstrap(g->pmu.flcn, g->bios.preos.code_entry_point);
 
-        if (nvgpu_flcn_wait_for_halt(g->pmu.flcn,
-                PMU_BOOT_TIMEOUT_MAX / 1000)) {
-                err = -ETIMEDOUT;
-                goto out;
-        }
+        err = g->ops.bios.preos_wait_for_halt(g);
 
         nvgpu_flcn_clear_halt_intr_status(g->pmu.flcn,
                         gk20a_get_gr_idle_timeout(g));