intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-29 09:03:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: initialize ipVersion in linux paths"

Browse Source 
This reverts commit 049cd1b568.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2023-05-20 06:46:36 +02:00
committed by Compute-Runtime-Automation
parent b29a88c69a
commit c748fd07dc
4 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shared/source/os_interface/linux/ioctl_helper_prelim.cpp
View File

@@ -785,13 +785,8 @@ bool IoctlHelperPrelim20::initialize() {
EngineClassInstance engineInfo = {static_cast<uint16_t>(getDrmParamValue(DrmParam::EngineClassRender)), 0};
int ret = 0;
bool result = queryHwIpVersion(engineInfo, hwInfo->ipVersion, ret);
auto &productHelper = drm.getRootDeviceEnvironment().getHelper<ProductHelper>();
if (result == false) {
hwInfo->ipVersion.value = productHelper.getProductConfigFromHwInfo(*hwInfo);
}
if (result == false && ret != 0 && productHelper.isPlatformQuerySupported()) {
int err = drm.getErrno();
PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stderr,

7
shared/source/os_interface/linux/ioctl_helper_upstream.cpp
View File

@@ -6,22 +6,15 @@
*/
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/execution_environment/root_device_environment.h"
#include "shared/source/helpers/common_types.h"
#include "shared/source/helpers/hw_info.h"
#include "shared/source/os_interface/linux/cache_info.h"
#include "shared/source/os_interface/linux/drm_neo.h"
#include "shared/source/os_interface/linux/drm_wrappers.h"
#include "shared/source/os_interface/linux/i915_upstream.h"
#include "shared/source/os_interface/linux/ioctl_helper.h"
#include "shared/source/os_interface/product_helper.h"
namespace NEO {
bool IoctlHelperUpstream::initialize() {
auto hwInfo = this->drm.getRootDeviceEnvironment().getMutableHardwareInfo();
auto &productHelper = this->drm.getRootDeviceEnvironment().getHelper<ProductHelper>();
hwInfo->ipVersion.value = productHelper.getProductConfigFromHwInfo(*hwInfo);
return true;
}

5
shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp
View File

@@ -22,7 +22,6 @@
#include "shared/source/os_interface/linux/engine_info.h"
#include "shared/source/os_interface/linux/memory_info.h"
#include "shared/source/os_interface/linux/os_context_linux.h"
#include "shared/source/os_interface/product_helper.h"
#include "drm/i915_drm_prelim.h"
#include "drm/xe_drm.h"
@@ -242,10 +241,6 @@ bool IoctlHelperXe::initialize() {
auto hwInfo = this->drm.getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->platform.usDeviceID = chipsetId;
hwInfo->platform.usRevId = revId;
auto &productHelper = this->drm.getRootDeviceEnvironment().getHelper<ProductHelper>();
hwInfo->ipVersion.value = productHelper.getProductConfigFromHwInfo(*hwInfo);
return ret;
}

11
shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp
View File

@@ -587,16 +587,15 @@ TEST_F(IoctlHelperPrelimFixture, givenIoctlHelperWhenInitializatedThenIpVersionI
EXPECT_EQ(ipVersion.architecture, 3u);
}
TEST_F(IoctlHelperPrelimFixture, givenIoctlHelperWhenFailOnInitializationThenIpVersionIsSet) {
auto hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getMutableHardwareInfo();
auto &productHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper<ProductHelper>();
auto &ipVersion = hwInfo->ipVersion;
TEST_F(IoctlHelperPrelimFixture, givenIoctlHelperWhenFailOnInitializationThenIpVersionIsNotSet) {
auto &ipVersion = executionEnvironment->rootDeviceEnvironments[0]->getMutableHardwareInfo()->ipVersion;
ipVersion = {};
drm->failRetHwIpVersion = true;
EXPECT_FALSE(drm->ioctlHelper->initialize());
auto config = productHelper.getProductConfigFromHwInfo(*hwInfo);
EXPECT_EQ(config, ipVersion.value);
EXPECT_EQ(ipVersion.revision, 0u);
EXPECT_EQ(ipVersion.release, 0u);
EXPECT_EQ(ipVersion.architecture, 0u);
}
TEST_F(IoctlHelperPrelimFixture, givenIoctlHelperWhenInvalidHwIpVersionSizeOnInitializationThenErrorIsPrinted) {