fix: defer creation of IoctlHelperXe

create IoctlHelperXe within Drm::setupIoctlHelper

Related-To: NEO-13527
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

shared/source/os_interface/linux/drm_neo.cpp

@@ -1091,9 +1091,12 @@ bool Drm::completionFenceSupport() {
 
 void Drm::setupIoctlHelper(const PRODUCT_FAMILY productFamily) {
     if (!this->ioctlHelper) {
+        auto drmVersion = Drm::getDrmVersion(getFileDescriptor());
         auto productSpecificIoctlHelperCreator = ioctlHelperFactory[productFamily];
         if (productSpecificIoctlHelperCreator && !debugManager.flags.IgnoreProductSpecificIoctlHelper.get()) {
             this->ioctlHelper = productSpecificIoctlHelperCreator.value()(*this);
+        } else if ("xe" == drmVersion) {
+            this->ioctlHelper = IoctlHelperXe::create(*this);
         } else {
             std::string prelimVersion = "";
             getPrelimVersion(prelimVersion);
@@ -1726,10 +1729,8 @@ bool Drm::isDrmSupported(int fileDescriptor) {
 bool Drm::queryDeviceIdAndRevision() {
     auto drmVersion = Drm::getDrmVersion(getFileDescriptor());
     if ("xe" == drmVersion) {
-        this->ioctlHelper = IoctlHelperXe::create(*this);
-        auto xeIoctlHelperPtr = static_cast<IoctlHelperXe *>(this->ioctlHelper.get());
         this->setPerContextVMRequired(false);
-        return xeIoctlHelperPtr->initialize();
+        return IoctlHelperXe::queryDeviceIdAndRevision(*this);
     }
     return IoctlHelperI915::queryDeviceIdAndRevision(*this);
 }

shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp

@@ -161,10 +161,6 @@ bool IoctlHelperXe::initialize() {
 
     euDebugInterface = EuDebugInterface::create(drm.getSysFsPciPath());
 
-    if (!IoctlHelperXe::queryDeviceIdAndRevision(this->drm)) {
-        return false;
-    }
-
     drm_xe_device_query queryConfig = {};
     queryConfig.query = DRM_XE_DEVICE_QUERY_CONFIG;
 

shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp

@@ -1959,13 +1959,10 @@ TEST_F(IoctlHelperXeTest, whenInitializeThenProperHwInfoIsSet) {
 
     auto hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getMutableHardwareInfo();
 
-    hwInfo->platform.usDeviceID = defaultHwInfo->platform.usDeviceID + 1;
-    hwInfo->platform.usRevId = defaultHwInfo->platform.usRevId + 1;
     hwInfo->capabilityTable.gpuAddressSpace = 0;
 
     ioctlHelper->initialize();
-    EXPECT_EQ(defaultHwInfo->platform.usRevId, hwInfo->platform.usRevId);
-    EXPECT_EQ(defaultHwInfo->platform.usDeviceID, hwInfo->platform.usDeviceID);
+
     EXPECT_EQ((1ull << 48) - 1, hwInfo->capabilityTable.gpuAddressSpace);
     EXPECT_EQ(static_cast<uint32_t>(DrmMockXe::mockDefaultCxlType), hwInfo->capabilityTable.cxlType);