refactor: remove not needed check for exec softpin

Related-To: NEO-10496
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2024-03-22 15:23:06 +00:00
committed by Compute-Runtime-Automation
parent 9aa81bae75
commit d94be09020
16 changed files with 2 additions and 88 deletions

View File

@@ -535,14 +535,6 @@ TEST_F(DrmTests, GivenKnownDeviceWhenCreatingDrmThenHwInfoIsProperlySet) {
EXPECT_EQ(deviceId, mockRootDeviceEnvironment->getHardwareInfo()->platform.usDeviceID); EXPECT_EQ(deviceId, mockRootDeviceEnvironment->getHardwareInfo()->platform.usDeviceID);
} }
TEST_F(DrmTests, GivenNoSoftPinWhenCreatingDrmThenNullIsReturned) {
VariableBackup<decltype(haveSoftPin)> backupHaveSoftPin(&haveSoftPin);
haveSoftPin = 0;
auto drm = DrmWrap::createDrm(*mockRootDeviceEnvironment);
EXPECT_EQ(drm, nullptr);
}
TEST_F(DrmTests, WhenCantFindDeviceIdThenDrmIsNotCreated) { TEST_F(DrmTests, WhenCantFindDeviceIdThenDrmIsNotCreated) {
VariableBackup<decltype(failOnDeviceId)> backupFailOnDeviceId(&failOnDeviceId); VariableBackup<decltype(failOnDeviceId)> backupFailOnDeviceId(&failOnDeviceId);
failOnDeviceId = -1; failOnDeviceId = -1;
@@ -575,14 +567,6 @@ TEST_F(DrmTests, WhenCantQueryRevisionIdThenDrmIsNotCreated) {
EXPECT_EQ(drm, nullptr); EXPECT_EQ(drm, nullptr);
} }
TEST_F(DrmTests, WhenCantQuerySoftPinSupportThenDrmIsNotCreated) {
VariableBackup<decltype(failOnSoftPin)> backupFailOnSoftPin(&failOnSoftPin);
failOnSoftPin = -1;
auto drm = DrmWrap::createDrm(*mockRootDeviceEnvironment);
EXPECT_EQ(drm, nullptr);
}
TEST_F(DrmTests, GivenFailOnParamBoostWhenCreatingDrmThenDrmIsCreated) { TEST_F(DrmTests, GivenFailOnParamBoostWhenCreatingDrmThenDrmIsCreated) {
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost); VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
failOnParamBoost = -1; failOnParamBoost = -1;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018-2023 Intel Corporation * Copyright (C) 2018-2024 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@@ -25,7 +25,6 @@ int fakeFd = 1023;
int haveDri = 0; // index of dri to serve, -1 - none int haveDri = 0; // index of dri to serve, -1 - none
int deviceId = NEO::deviceDescriptorTable[0].deviceId; // default supported DeviceID int deviceId = NEO::deviceDescriptorTable[0].deviceId; // default supported DeviceID
int revisionId = 17; int revisionId = 17;
int haveSoftPin = 1;
int havePreemption = I915_SCHEDULER_CAP_ENABLED | int havePreemption = I915_SCHEDULER_CAP_ENABLED |
I915_SCHEDULER_CAP_PRIORITY | I915_SCHEDULER_CAP_PRIORITY |
I915_SCHEDULER_CAP_PREEMPTION; I915_SCHEDULER_CAP_PREEMPTION;
@@ -34,7 +33,6 @@ int failOnDeviceId = 0;
int failOnEuTotal = 0; int failOnEuTotal = 0;
int failOnSubsliceTotal = 0; int failOnSubsliceTotal = 0;
int failOnRevisionId = 0; int failOnRevisionId = 0;
int failOnSoftPin = 0;
int failOnParamBoost = 0; int failOnParamBoost = 0;
int failOnSetParamSseu = 0; int failOnSetParamSseu = 0;
int failOnGetParamSseu = 0; int failOnGetParamSseu = 0;
@@ -156,10 +154,6 @@ int drmGetParam(NEO::GetParam *param) {
*param->value = revisionId; *param->value = revisionId;
ret = failOnRevisionId; ret = failOnRevisionId;
break; break;
case I915_PARAM_HAS_EXEC_SOFTPIN:
*param->value = haveSoftPin;
ret = failOnSoftPin;
break;
#if defined(I915_PARAM_HAS_SCHEDULER) #if defined(I915_PARAM_HAS_SCHEDULER)
case I915_PARAM_HAS_SCHEDULER: case I915_PARAM_HAS_SCHEDULER:
*param->value = havePreemption; *param->value = havePreemption;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018-2023 Intel Corporation * Copyright (C) 2018-2024 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@@ -26,13 +26,11 @@ extern int fakeFd;
extern int haveDri; // index of dri to serve, -1 - none extern int haveDri; // index of dri to serve, -1 - none
extern int deviceId; // known DeviceID extern int deviceId; // known DeviceID
extern int revisionId; extern int revisionId;
extern int haveSoftPin;
extern int vmId; extern int vmId;
extern int failOnDeviceId; extern int failOnDeviceId;
extern int failOnEuTotal; extern int failOnEuTotal;
extern int failOnSubsliceTotal; extern int failOnSubsliceTotal;
extern int failOnRevisionId; extern int failOnRevisionId;
extern int failOnSoftPin;
extern int failOnParamBoost; extern int failOnParamBoost;
extern int failOnContextCreate; extern int failOnContextCreate;
extern int failOnVirtualMemoryCreate; extern int failOnVirtualMemoryCreate;

View File

@@ -63,20 +63,6 @@ Drm *Drm::create(std::unique_ptr<HwDeviceIdDrm> &&hwDeviceId, RootDeviceEnvironm
return nullptr; return nullptr;
} }
// Detect device parameters
int hasExecSoftPin = 0;
ret = drm->getExecSoftPin(hasExecSoftPin);
if (ret != 0) {
printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query Soft Pin parameter!\n");
return nullptr;
}
if (!hasExecSoftPin) {
printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s",
"FATAL: Device doesn't support Soft-Pin but this is required.\n");
return nullptr;
}
// Activate the Turbo Boost Frequency feature // Activate the Turbo Boost Frequency feature
ret = drm->enableTurboBoost(); ret = drm->enableTurboBoost();
if (ret != 0) { if (ret != 0) {

View File

@@ -166,10 +166,6 @@ int Drm::getParamIoctl(DrmParam param, int *dstValue) {
return retVal; return retVal;
} }
int Drm::getExecSoftPin(int &execSoftPin) {
return getParamIoctl(DrmParam::paramHasExecSoftpin, &execSoftPin);
}
bool Drm::queryI915DeviceIdAndRevision() { bool Drm::queryI915DeviceIdAndRevision() {
HardwareInfo *hwInfo = rootDeviceEnvironment.getMutableHardwareInfo(); HardwareInfo *hwInfo = rootDeviceEnvironment.getMutableHardwareInfo();
int deviceId = hwInfo->platform.usDeviceID; int deviceId = hwInfo->platform.usDeviceID;

View File

@@ -82,7 +82,6 @@ class Drm : public DriverModel {
return 0; return 0;
} }
PhysicalDevicePciSpeedInfo getPciSpeedInfo() const override; PhysicalDevicePciSpeedInfo getPciSpeedInfo() const override;
int getExecSoftPin(int &execSoftPin);
int enableTurboBoost(); int enableTurboBoost();
int getEuTotal(int &euTotal); int getEuTotal(int &euTotal);
int getSubsliceTotal(int &subsliceTotal); int getSubsliceTotal(int &subsliceTotal);

View File

@@ -300,7 +300,6 @@ enum class DrmParam {
mmapOffsetWc, mmapOffsetWc,
paramChipsetId, paramChipsetId,
paramRevision, paramRevision,
paramHasExecSoftpin,
paramHasPooledEu, paramHasPooledEu,
paramHasScheduler, paramHasScheduler,
paramEuTotal, paramEuTotal,

View File

@@ -136,8 +136,6 @@ int IoctlHelperI915::getDrmParamValueBase(DrmParam drmParam) const {
return I915_PARAM_CHIPSET_ID; return I915_PARAM_CHIPSET_ID;
case DrmParam::paramRevision: case DrmParam::paramRevision:
return I915_PARAM_REVISION; return I915_PARAM_REVISION;
case DrmParam::paramHasExecSoftpin:
return I915_PARAM_HAS_EXEC_SOFTPIN;
case DrmParam::paramHasPooledEu: case DrmParam::paramHasPooledEu:
return I915_PARAM_HAS_POOLED_EU; return I915_PARAM_HAS_POOLED_EU;
case DrmParam::paramHasScheduler: case DrmParam::paramHasScheduler:
@@ -339,8 +337,6 @@ std::string IoctlHelperI915::getDrmParamString(DrmParam drmParam) const {
return "I915_PARAM_CHIPSET_ID"; return "I915_PARAM_CHIPSET_ID";
case DrmParam::paramRevision: case DrmParam::paramRevision:
return "I915_PARAM_REVISION"; return "I915_PARAM_REVISION";
case DrmParam::paramHasExecSoftpin:
return "I915_PARAM_HAS_EXEC_SOFTPIN";
case DrmParam::paramHasPooledEu: case DrmParam::paramHasPooledEu:
return "I915_PARAM_HAS_POOLED_EU"; return "I915_PARAM_HAS_POOLED_EU";
case DrmParam::paramHasScheduler: case DrmParam::paramHasScheduler:

View File

@@ -929,9 +929,6 @@ int IoctlHelperXe::ioctl(DrmIoctl request, void *arg) {
case static_cast<int>(DrmParam::paramHasPageFault): case static_cast<int>(DrmParam::paramHasPageFault):
*d->value = 0; *d->value = 0;
break; break;
case static_cast<int>(DrmParam::paramHasExecSoftpin):
*d->value = 1;
break;
case static_cast<int>(DrmParam::paramHasScheduler): case static_cast<int>(DrmParam::paramHasScheduler):
*d->value = static_cast<int>(0x80000037); *d->value = static_cast<int>(0x80000037);
break; break;
@@ -1351,8 +1348,6 @@ std::string IoctlHelperXe::getDrmParamString(DrmParam drmParam) const {
return "ParamChipsetId"; return "ParamChipsetId";
case DrmParam::paramRevision: case DrmParam::paramRevision:
return "ParamRevision"; return "ParamRevision";
case DrmParam::paramHasExecSoftpin:
return "ParamHasExecSoftpin";
case DrmParam::paramHasPooledEu: case DrmParam::paramHasPooledEu:
return "ParamHasPooledEu"; return "ParamHasPooledEu";
case DrmParam::paramHasScheduler: case DrmParam::paramHasScheduler:

View File

@@ -94,10 +94,6 @@ int DrmMock::ioctl(DrmIoctl request, void *arg) {
*gp->value = this->storedPreemptionSupport; *gp->value = this->storedPreemptionSupport;
return this->storedRetVal; return this->storedRetVal;
} }
if (gp->param == I915_PARAM_HAS_EXEC_SOFTPIN) {
*gp->value = this->storedExecSoftPin;
return this->storedRetVal;
}
if (gp->param == I915_PARAM_CS_TIMESTAMP_FREQUENCY) { if (gp->param == I915_PARAM_CS_TIMESTAMP_FREQUENCY) {
*gp->value = this->storedCsTimestampFrequency; *gp->value = this->storedCsTimestampFrequency;
return this->storedRetVal; return this->storedRetVal;

View File

@@ -205,7 +205,6 @@ class DrmMock : public Drm {
int storedRetValForPersistant = 0; int storedRetValForPersistant = 0;
int storedRetValForVmCreate = 0; int storedRetValForVmCreate = 0;
int storedPreemptionSupport = 0; int storedPreemptionSupport = 0;
int storedExecSoftPin = 0;
int storedRetValForVmId = 1; int storedRetValForVmId = 1;
int storedCsTimestampFrequency = 1000; int storedCsTimestampFrequency = 1000;
int storedOaTimestampFrequency = 123456; int storedOaTimestampFrequency = 123456;

View File

@@ -481,23 +481,6 @@ TEST(DrmTest, givenDrmPreemptionEnabledAndLowPriorityEngineWhenCreatingOsContext
EXPECT_EQ(0u, drmMock.receivedContextParamRequest.size); EXPECT_EQ(0u, drmMock.receivedContextParamRequest.size);
} }
TEST(DrmTest, WhenGettingExecSoftPinThenCorrectValueIsReturned) {
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
DrmMock *pDrm = new DrmMock(*executionEnvironment->rootDeviceEnvironments[0]);
int execSoftPin = 0;
int ret = pDrm->getExecSoftPin(execSoftPin);
EXPECT_EQ(0, ret);
EXPECT_EQ(0, execSoftPin);
pDrm->storedExecSoftPin = 1;
ret = pDrm->getExecSoftPin(execSoftPin);
EXPECT_EQ(0, ret);
EXPECT_EQ(1, execSoftPin);
delete pDrm;
}
TEST(DrmTest, WhenEnablingTurboBoostThenSucceeds) { TEST(DrmTest, WhenEnablingTurboBoostThenSucceeds) {
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>(); auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
DrmMock *pDrm = new DrmMock(*executionEnvironment->rootDeviceEnvironments[0]); DrmMock *pDrm = new DrmMock(*executionEnvironment->rootDeviceEnvironments[0]);
@@ -1594,7 +1577,6 @@ TEST(DrmWrapperTest, WhenGettingDrmParamValueStringThenProperStringIsReturned) {
MockIoctlHelper ioctlHelper{drm}; MockIoctlHelper ioctlHelper{drm};
std::map<DrmParam, const char *> ioctlCodeStringMap = { std::map<DrmParam, const char *> ioctlCodeStringMap = {
{DrmParam::paramHasExecSoftpin, "I915_PARAM_HAS_EXEC_SOFTPIN"},
{DrmParam::paramHasPooledEu, "I915_PARAM_HAS_POOLED_EU"}, {DrmParam::paramHasPooledEu, "I915_PARAM_HAS_POOLED_EU"},
{DrmParam::paramHasScheduler, "I915_PARAM_HAS_SCHEDULER"}, {DrmParam::paramHasScheduler, "I915_PARAM_HAS_SCHEDULER"},
{DrmParam::paramEuTotal, "I915_PARAM_EU_TOTAL"}, {DrmParam::paramEuTotal, "I915_PARAM_EU_TOTAL"},

View File

@@ -163,7 +163,6 @@ DG1TEST_F(IoctlHelperTestsDg1, whenGettingDrmParamStringThenProperStringIsReturn
auto &ioctlHelper = *drm->getIoctlHelper(); auto &ioctlHelper = *drm->getIoctlHelper();
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasExecSoftpin).c_str(), "I915_PARAM_HAS_EXEC_SOFTPIN");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL");

View File

@@ -96,7 +96,6 @@ TEST_F(IoctlPrelimHelperTests, whenGettingIoctlRequestValueThenPropertValueIsRet
TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamStringThenProperStringIsReturned) { TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamStringThenProperStringIsReturned) {
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasExecSoftpin).c_str(), "I915_PARAM_HAS_EXEC_SOFTPIN");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
@@ -177,7 +176,6 @@ TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamValueThenPropertValueIsReturne
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWc), static_cast<int>(I915_MMAP_OFFSET_WC)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWc), static_cast<int>(I915_MMAP_OFFSET_WC));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramChipsetId), static_cast<int>(I915_PARAM_CHIPSET_ID)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramChipsetId), static_cast<int>(I915_PARAM_CHIPSET_ID));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramRevision), static_cast<int>(I915_PARAM_REVISION)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramRevision), static_cast<int>(I915_PARAM_REVISION));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasExecSoftpin), static_cast<int>(I915_PARAM_HAS_EXEC_SOFTPIN));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasPooledEu), static_cast<int>(I915_PARAM_HAS_POOLED_EU)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasPooledEu), static_cast<int>(I915_PARAM_HAS_POOLED_EU));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasScheduler), static_cast<int>(I915_PARAM_HAS_SCHEDULER)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasScheduler), static_cast<int>(I915_PARAM_HAS_SCHEDULER));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramEuTotal), static_cast<int>(I915_PARAM_EU_TOTAL)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramEuTotal), static_cast<int>(I915_PARAM_EU_TOTAL));

View File

@@ -228,7 +228,6 @@ TEST(IoctlHelperUpstreamTest, whenGettingDrmParamStringThenProperStringIsReturne
IoctlHelperUpstream ioctlHelper{*drm}; IoctlHelperUpstream ioctlHelper{*drm};
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasExecSoftpin).c_str(), "I915_PARAM_HAS_EXEC_SOFTPIN");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER");
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
@@ -268,7 +267,6 @@ TEST(IoctlHelperUpstreamTest, whenGettingDrmParamValueThenPropertValueIsReturned
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWc), static_cast<int>(I915_MMAP_OFFSET_WC)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWc), static_cast<int>(I915_MMAP_OFFSET_WC));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramChipsetId), static_cast<int>(I915_PARAM_CHIPSET_ID)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramChipsetId), static_cast<int>(I915_PARAM_CHIPSET_ID));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramRevision), static_cast<int>(I915_PARAM_REVISION)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramRevision), static_cast<int>(I915_PARAM_REVISION));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasExecSoftpin), static_cast<int>(I915_PARAM_HAS_EXEC_SOFTPIN));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasPooledEu), static_cast<int>(I915_PARAM_HAS_POOLED_EU)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasPooledEu), static_cast<int>(I915_PARAM_HAS_POOLED_EU));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasScheduler), static_cast<int>(I915_PARAM_HAS_SCHEDULER)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasScheduler), static_cast<int>(I915_PARAM_HAS_SCHEDULER));
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramEuTotal), static_cast<int>(I915_PARAM_EU_TOTAL)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramEuTotal), static_cast<int>(I915_PARAM_EU_TOTAL));

View File

@@ -362,7 +362,6 @@ TEST(IoctlHelperXeTest, givenIoctlHelperXeWhenCallingAnyMethodThenDummyValueIsRe
verifyDrmParamString("MmapOffsetWc", DrmParam::mmapOffsetWc); verifyDrmParamString("MmapOffsetWc", DrmParam::mmapOffsetWc);
verifyDrmParamString("ParamChipsetId", DrmParam::paramChipsetId); verifyDrmParamString("ParamChipsetId", DrmParam::paramChipsetId);
verifyDrmParamString("ParamRevision", DrmParam::paramRevision); verifyDrmParamString("ParamRevision", DrmParam::paramRevision);
verifyDrmParamString("ParamHasExecSoftpin", DrmParam::paramHasExecSoftpin);
verifyDrmParamString("ParamHasPooledEu", DrmParam::paramHasPooledEu); verifyDrmParamString("ParamHasPooledEu", DrmParam::paramHasPooledEu);
verifyDrmParamString("ParamHasScheduler", DrmParam::paramHasScheduler); verifyDrmParamString("ParamHasScheduler", DrmParam::paramHasScheduler);
verifyDrmParamString("ParamEuTotal", DrmParam::paramEuTotal); verifyDrmParamString("ParamEuTotal", DrmParam::paramEuTotal);
@@ -667,10 +666,6 @@ TEST(IoctlHelperXeTest, whenCallingIoctlThenProperValueIsReturned) {
ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test); ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test);
EXPECT_EQ(0, ret); EXPECT_EQ(0, ret);
EXPECT_EQ(dstvalue, 0); EXPECT_EQ(dstvalue, 0);
test.param = static_cast<int>(DrmParam::paramHasExecSoftpin);
ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test);
EXPECT_EQ(0, ret);
EXPECT_EQ(dstvalue, 1);
test.param = static_cast<int>(DrmParam::paramHasScheduler); test.param = static_cast<int>(DrmParam::paramHasScheduler);
ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test); ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test);
EXPECT_EQ(0, ret); EXPECT_EQ(0, ret);