Make IoctlHelper member of Drm

Related-To: NEO-6575

This is needed to fix accessing IoctlHelper
after driver detach.
This way we are also reducing accessing
sysfs file in Drm::getPrelimVersion

Signed-off-by: Szymon Morek <szymon.morek@intel.com>
This commit is contained in:
Szymon Morek
2022-01-21 12:39:11 +00:00
committed by Compute-Runtime-Automation
parent 63a8908744
commit d9886f67ee
26 changed files with 181 additions and 194 deletions

View File

@@ -12,6 +12,7 @@
#include "shared/source/helpers/debug_helpers.h"
#include "shared/source/helpers/engine_node_helper.h"
#include "shared/source/helpers/hw_info.h"
#include "shared/source/os_interface/linux/drm_neo.h"
#include <array>
@@ -41,7 +42,7 @@ EngineInfo::EngineInfo(Drm *drm, HardwareInfo *hwInfo, const std::vector<EngineC
bcsInfoMask, numHostLinkCopyEngines, numScaleUpLinkCopyEngines);
break;
default:
if (engine.engineClass == IoctlHelper::get(drm)->getComputeEngineClass()) {
if (engine.engineClass == drm->getIoctlHelper()->getComputeEngineClass()) {
tileToEngineToInstanceMap[0][static_cast<aub_stream::EngineType>(aub_stream::ENGINE_CCS + computeEngines)] = engine;
computeEngines++;
}
@@ -76,7 +77,7 @@ EngineInfo::EngineInfo(Drm *drm, HardwareInfo *hwInfo, uint32_t tileCount, const
copyEnginesPerTile++;
break;
default:
if (engine.engineClass == IoctlHelper::get(drm)->getComputeEngineClass()) {
if (engine.engineClass == drm->getIoctlHelper()->getComputeEngineClass()) {
tileToEngineToInstanceMap[tile][static_cast<aub_stream::EngineType>(aub_stream::ENGINE_CCS + computeEnginesPerTile)] = engine;
computeEnginesPerTile++;
}