Init gmm after filling hardware info

Change-Id: I91c5704ef200b22214f37b2c02197cfad426de70
Signed-off-by: Jablonski, Mateusz <mateusz.jablonski@intel.com>
This commit is contained in:
Jablonski, Mateusz
2019-07-10 18:35:06 +02:00
parent ce061a48ef
commit 8a3f215dff
2 changed files with 4 additions and 1 deletions

View File

@@ -25,7 +25,6 @@ bool DeviceFactory::getDevices(size_t &numDevices, ExecutionEnvironment &executi
numDevices = 0;
auto hardwareInfo = executionEnvironment.getMutableHardwareInfo();
executionEnvironment.initGmm();
std::unique_ptr<Wddm> wddm(Wddm::createWddm());
if (!wddm->init(*hardwareInfo)) {
return false;

View File

@@ -9,6 +9,7 @@
#include "core/helpers/interlocked_max.h"
#include "runtime/command_stream/preemption.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/gmm_helper/gmm.h"
#include "runtime/gmm_helper/gmm_helper.h"
#include "runtime/gmm_helper/page_table_mngr.h"
@@ -22,6 +23,7 @@
#include "runtime/os_interface/windows/wddm/wddm_interface.h"
#include "runtime/os_interface/windows/wddm_allocation.h"
#include "runtime/os_interface/windows/wddm_engine_mapper.h"
#include "runtime/platform/platform.h"
#include "runtime/sku_info/operations/sku_info_receiver.h"
#include "gmm_memory.h"
@@ -91,6 +93,8 @@ bool Wddm::init(HardwareInfo &outHardwareInfo) {
return false;
}
platform()->peekExecutionEnvironment()->initGmm();
auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(outHardwareInfo);
if (featureTable->ftrWddmHwQueues) {