case IP_VERSION(9, 1, 0):
        case IP_VERSION(9, 3, 0):
                if (!enable)
-                       amdgpu_gfx_off_ctrl(adev, false);
+                       amdgpu_gfx_off_ctrl_immediate(adev, false);
 
                if (adev->pg_flags & AMD_PG_SUPPORT_RLC_SMU_HS) {
                        gfx_v9_0_enable_sck_slow_down_on_power_up(adev, true);
                gfx_v9_0_update_gfx_mg_power_gating(adev, enable);
 
                if (enable)
-                       amdgpu_gfx_off_ctrl(adev, true);
+                       amdgpu_gfx_off_ctrl_immediate(adev, true);
                break;
        case IP_VERSION(9, 2, 1):
-               amdgpu_gfx_off_ctrl(adev, enable);
+               amdgpu_gfx_off_ctrl_immediate(adev, enable);
                break;
        default:
                break;