Skip to content

Commit 270570c

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
refactor: move i915 specific logic to ioctl helper i915
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent 46a0c87 commit 270570c

File tree

11 files changed

+69
-145
lines changed

11 files changed

+69
-145
lines changed

‎shared/source/os_interface/linux/drm_neo.cpp‎

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ int Drm::ioctl(DrmIoctl request, void *arg) {
9898
auto printIoctl = debugManager.flags.PrintIoctlEntries.get();
9999

100100
if (printIoctl) {
101-
printf("IOCTL %s called\n", getIoctlString(request, ioctlHelper.get()).c_str());
101+
printf("IOCTL %s called\n", ioctlHelper->getIoctlString(request).c_str());
102102
}
103103

104104
if (measureTime) {
@@ -131,10 +131,10 @@ int Drm::ioctl(DrmIoctl request, void *arg) {
131131
if (printIoctl) {
132132
if (ret == 0) {
133133
printf("IOCTL %s returns %d\n",
134-
getIoctlString(request, ioctlHelper.get()).c_str(), ret);
134+
ioctlHelper->getIoctlString(request).c_str(), ret);
135135
} else {
136136
printf("IOCTL %s returns %d, errno %d(%s)\n",
137-
getIoctlString(request, ioctlHelper.get()).c_str(), ret, returnedErrno, strerror(returnedErrno));
137+
ioctlHelper->getIoctlString(request).c_str(), ret, returnedErrno, strerror(returnedErrno));
138138
}
139139
}
140140

@@ -145,38 +145,19 @@ int Drm::ioctl(DrmIoctl request, void *arg) {
145145

146146
int Drm::getParamIoctl(DrmParam param, int *dstValue) {
147147
GetParam getParam{};
148-
getParam.param = getDrmParamValue(param, ioctlHelper.get());
148+
getParam.param = ioctlHelper->getDrmParamValue(param);
149149
getParam.value = dstValue;
150150

151-
int retVal = ioctlHelper ? ioctlHelper->ioctl(DrmIoctl::getparam, &getParam) : ioctl(DrmIoctl::getparam, &getParam);
151+
int retVal = ioctlHelper->ioctl(DrmIoctl::getparam, &getParam);
152152
if (debugManager.flags.PrintIoctlEntries.get()) {
153153
printf("DRM_IOCTL_I915_GETPARAM: param: %s, output value: %d, retCode:% d\n",
154-
getDrmParamString(param, ioctlHelper.get()).c_str(),
154+
ioctlHelper->getDrmParamString(param).c_str(),
155155
*getParam.value,
156156
retVal);
157157
}
158158
return retVal;
159159
}
160160

161-
bool Drm::queryI915DeviceIdAndRevision() {
162-
HardwareInfo *hwInfo = rootDeviceEnvironment.getMutableHardwareInfo();
163-
int deviceId = hwInfo->platform.usDeviceID;
164-
int revisionId = hwInfo->platform.usRevId;
165-
auto ret = getParamIoctl(DrmParam::paramChipsetId, &deviceId);
166-
if (ret != 0) {
167-
printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query device ID parameter!\n");
168-
return false;
169-
}
170-
ret = getParamIoctl(DrmParam::paramRevision, &revisionId);
171-
if (ret != 0) {
172-
printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query device Rev ID parameter!\n");
173-
return false;
174-
}
175-
hwInfo->platform.usDeviceID = deviceId;
176-
hwInfo->platform.usRevId = revisionId;
177-
return true;
178-
}
179-
180161
int Drm::enableTurboBoost() {
181162
GemContextParam contextParam = {};
182163

@@ -771,7 +752,7 @@ void Drm::printIoctlStatistics() {
771752
printf("%41s %15s %10s %20s %20s %20s", "Request", "Total time(ns)", "Count", "Avg time per ioctl", "Min", "Max\n");
772753
for (const auto &ioctlData : this->ioctlStatistics) {
773754
printf("%41s %15llu %10lu %20f %20lld %20lld\n",
774-
getIoctlString(ioctlData.first, ioctlHelper.get()).c_str(),
755+
ioctlHelper->getIoctlString(ioctlData.first).c_str(),
775756
ioctlData.second.totalTime,
776757
static_cast<unsigned long>(ioctlData.second.count),
777758
ioctlData.second.totalTime / static_cast<double>(ioctlData.second.count),
@@ -1745,7 +1726,7 @@ bool Drm::queryDeviceIdAndRevision() {
17451726
this->setPerContextVMRequired(false);
17461727
return xeIoctlHelperPtr->initialize();
17471728
}
1748-
return queryI915DeviceIdAndRevision();
1729+
return IoctlHelperI915::queryDeviceIdAndRevision(*this);
17491730
}
17501731

17511732
template std::vector<uint16_t> Drm::query<uint16_t>(uint32_t queryId, uint32_t queryItemFlags);

‎shared/source/os_interface/linux/drm_neo.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ class Drm : public DriverModel {
280280
void setupIoctlHelper(const PRODUCT_FAMILY productFamily);
281281
void queryAndSetVmBindPatIndexProgrammingSupport();
282282
bool queryDeviceIdAndRevision();
283-
bool queryI915DeviceIdAndRevision();
284283
static uint64_t alignUpGttSize(uint64_t inputGttSize);
285284

286285
#pragma pack(1)

‎shared/source/os_interface/linux/drm_wrappers.cpp‎

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (C) 2022-2023 Intel Corporation
2+
* Copyright (C) 2022-2024 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

88
#include "shared/source/os_interface/linux/drm_wrappers.h"
99

10-
#include "shared/source/os_interface/linux/i915.h"
1110
#include "shared/source/os_interface/linux/ioctl_helper.h"
1211

12+
#include "drm.h"
13+
1314
#include <cstddef>
1415

1516
namespace NEO {
@@ -19,8 +20,6 @@ unsigned int getIoctlRequestValue(DrmIoctl ioctlRequest, IoctlHelper *ioctlHelpe
1920
return ioctlHelper->getIoctlRequestValue(ioctlRequest);
2021
}
2122
switch (ioctlRequest) {
22-
case DrmIoctl::getparam:
23-
return DRM_IOCTL_I915_GETPARAM;
2423
case DrmIoctl::version:
2524
return DRM_IOCTL_VERSION;
2625
default:
@@ -35,47 +34,4 @@ bool checkIfIoctlReinvokeRequired(int error, DrmIoctl ioctlRequest, IoctlHelper
3534
}
3635
return (error == EINTR || error == EAGAIN || error == EBUSY || error == -EBUSY);
3736
}
38-
39-
int getDrmParamValue(DrmParam drmParam, IoctlHelper *ioctlHelper) {
40-
if (ioctlHelper) {
41-
return ioctlHelper->getDrmParamValue(drmParam);
42-
}
43-
switch (drmParam) {
44-
case DrmParam::paramChipsetId:
45-
return I915_PARAM_CHIPSET_ID;
46-
case DrmParam::paramRevision:
47-
return I915_PARAM_REVISION;
48-
default:
49-
UNRECOVERABLE_IF(true);
50-
return 0;
51-
}
52-
}
53-
54-
std::string getDrmParamString(DrmParam drmParam, IoctlHelper *ioctlHelper) {
55-
if (ioctlHelper) {
56-
return ioctlHelper->getDrmParamString(drmParam);
57-
}
58-
switch (drmParam) {
59-
case DrmParam::paramChipsetId:
60-
return "I915_PARAM_CHIPSET_ID";
61-
case DrmParam::paramRevision:
62-
return "I915_PARAM_REVISION";
63-
default:
64-
UNRECOVERABLE_IF(true);
65-
return "";
66-
}
67-
}
68-
69-
std::string getIoctlString(DrmIoctl ioctlRequest, IoctlHelper *ioctlHelper) {
70-
if (ioctlHelper) {
71-
return ioctlHelper->getIoctlString(ioctlRequest);
72-
}
73-
switch (ioctlRequest) {
74-
case DrmIoctl::getparam:
75-
return "DRM_IOCTL_I915_GETPARAM";
76-
default:
77-
UNRECOVERABLE_IF(true);
78-
return "";
79-
}
80-
}
8137
} // namespace NEO

‎shared/source/os_interface/linux/drm_wrappers.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,6 @@ enum class DrmParam {
300300
memoryClassSystem,
301301
mmapOffsetWb,
302302
mmapOffsetWc,
303-
paramChipsetId,
304-
paramRevision,
305303
paramHasPooledEu,
306304
paramEuTotal,
307305
paramSubsliceTotal,
@@ -320,9 +318,6 @@ enum class DrmParam {
320318
};
321319

322320
unsigned int getIoctlRequestValue(DrmIoctl ioctlRequest, IoctlHelper *ioctlHelper);
323-
int getDrmParamValue(DrmParam drmParam, IoctlHelper *ioctlHelper);
324-
std::string getDrmParamString(DrmParam param, IoctlHelper *ioctlHelper);
325-
std::string getIoctlString(DrmIoctl ioctlRequest, IoctlHelper *ioctlHelper);
326321
bool checkIfIoctlReinvokeRequired(int error, DrmIoctl ioctlRequest, IoctlHelper *ioctlHelper);
327322

328323
} // namespace NEO

‎shared/source/os_interface/linux/ioctl_helper.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,9 @@ class IoctlHelper {
243243
class IoctlHelperI915 : public IoctlHelper {
244244
public:
245245
using IoctlHelper::IoctlHelper;
246+
247+
static bool queryDeviceIdAndRevision(const Drm &drm);
248+
246249
void fillExecObject(ExecObject &execObject, uint32_t handle, uint64_t gpuAddress, uint32_t drmContextId, bool bindInfo, bool isMarkedForCapture) override;
247250
void logExecObject(const ExecObject &execObject, std::stringstream &logger, size_t size) override;
248251
void fillExecBuffer(ExecBuffer &execBuffer, uintptr_t buffersPtr, uint32_t bufferCount, uint32_t startOffset, uint32_t size, uint64_t flags, uint32_t drmContextId) override;

‎shared/source/os_interface/linux/ioctl_helper_i915.cpp‎

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "shared/source/os_interface/linux/ioctl_helper.h"
2121
#include "shared/source/os_interface/linux/memory_info.h"
2222
#include "shared/source/os_interface/linux/os_context_linux.h"
23+
#include "shared/source/os_interface/linux/sys_calls.h"
2324
#include "shared/source/os_interface/os_time.h"
2425

2526
#include <fcntl.h>
@@ -133,10 +134,6 @@ int IoctlHelperI915::getDrmParamValueBase(DrmParam drmParam) const {
133134
return I915_MMAP_OFFSET_WB;
134135
case DrmParam::mmapOffsetWc:
135136
return I915_MMAP_OFFSET_WC;
136-
case DrmParam::paramChipsetId:
137-
return I915_PARAM_CHIPSET_ID;
138-
case DrmParam::paramRevision:
139-
return I915_PARAM_REVISION;
140137
case DrmParam::paramHasPooledEu:
141138
return I915_PARAM_HAS_POOLED_EU;
142139
case DrmParam::paramEuTotal:
@@ -348,10 +345,6 @@ size_t IoctlHelperI915::getLocalMemoryRegionsSize(const MemoryInfo *memoryInfo,
348345

349346
std::string IoctlHelperI915::getDrmParamString(DrmParam drmParam) const {
350347
switch (drmParam) {
351-
case DrmParam::paramChipsetId:
352-
return "I915_PARAM_CHIPSET_ID";
353-
case DrmParam::paramRevision:
354-
return "I915_PARAM_REVISION";
355348
case DrmParam::paramHasPooledEu:
356349
return "I915_PARAM_HAS_POOLED_EU";
357350
case DrmParam::paramEuTotal:
@@ -684,4 +677,34 @@ bool IoctlHelperI915::isPreemptionSupported() {
684677
}
685678
return retVal == 0 && (schedulerCap & I915_SCHEDULER_CAP_PREEMPTION);
686679
}
680+
681+
bool IoctlHelperI915::queryDeviceIdAndRevision(const Drm &drm) {
682+
683+
HardwareInfo *hwInfo = drm.getRootDeviceEnvironment().getMutableHardwareInfo();
684+
auto fileDescriptor = drm.getFileDescriptor();
685+
int param{};
686+
687+
GetParam getParam{};
688+
getParam.param = I915_PARAM_CHIPSET_ID;
689+
getParam.value = &param;
690+
691+
int ret = SysCalls::ioctl(fileDescriptor, DRM_IOCTL_I915_GETPARAM, &getParam);
692+
if (ret) {
693+
printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query device ID parameter!\n");
694+
return false;
695+
}
696+
697+
hwInfo->platform.usDeviceID = param;
698+
699+
getParam.param = I915_PARAM_REVISION;
700+
ret = SysCalls::ioctl(fileDescriptor, DRM_IOCTL_I915_GETPARAM, &getParam);
701+
702+
if (ret != 0) {
703+
printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query device Rev ID parameter!\n");
704+
return false;
705+
}
706+
707+
hwInfo->platform.usRevId = param;
708+
return true;
709+
}
687710
} // namespace NEO

‎shared/test/unit_test/os_interface/linux/drm_tests.cpp‎

Lines changed: 23 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -292,16 +292,33 @@ TEST(DrmTest, WhenGettingRevisionIdThenCorrectIdIsReturned) {
292292

293293
auto hwInfo = pDrm->getRootDeviceEnvironment().getMutableHardwareInfo();
294294

295-
pDrm->storedDeviceID = 0x1234;
296-
pDrm->storedDeviceRevID = 0xB;
295+
static constexpr uint16_t mockDeviceId = 0x1234;
296+
static constexpr uint16_t mockRevisionId = 0xB;
297297

298298
hwInfo->platform.usDeviceID = 0;
299299
hwInfo->platform.usRevId = 0;
300300

301+
VariableBackup<decltype(SysCalls::sysCallsIoctl)> mockIoctl(&SysCalls::sysCallsIoctl);
302+
303+
SysCalls::sysCallsIoctl = [](int fileDescriptor, unsigned long int request, void *arg) -> int {
304+
if (request == DRM_IOCTL_I915_GETPARAM) {
305+
auto getParam = reinterpret_cast<GetParam *>(arg);
306+
if (getParam->param == I915_PARAM_CHIPSET_ID) {
307+
*getParam->value = mockDeviceId;
308+
} else if (getParam->param == I915_PARAM_REVISION) {
309+
*getParam->value = mockRevisionId;
310+
} else {
311+
return -1;
312+
}
313+
return 0;
314+
}
315+
return 1;
316+
};
317+
301318
EXPECT_TRUE(pDrm->queryDeviceIdAndRevision());
302319

303-
EXPECT_EQ(pDrm->storedDeviceID, hwInfo->platform.usDeviceID);
304-
EXPECT_EQ(pDrm->storedDeviceRevID, hwInfo->platform.usRevId);
320+
EXPECT_EQ(mockDeviceId, hwInfo->platform.usDeviceID);
321+
EXPECT_EQ(mockRevisionId, hwInfo->platform.usRevId);
305322
}
306323

307324
TEST(DrmTest, GivenDrmWhenAskedForGttSizeThenReturnCorrectValue) {
@@ -1745,42 +1762,16 @@ TEST(DrmTest, GivenDrmWhenDiscoveringDevicesThenCloseOnExecFlagIsPassedToFdOpen)
17451762
EXPECT_NE(0u, SysCalls::openFuncCalled);
17461763
}
17471764

1748-
TEST(DrmWrapperTest, WhenGettingDrmIoctlGetparamValueThenIoctlHelperIsNotNeeded) {
1749-
EXPECT_EQ(getIoctlRequestValue(DrmIoctl::getparam, nullptr), static_cast<unsigned int>(DRM_IOCTL_I915_GETPARAM));
1750-
EXPECT_THROW(getIoctlRequestValue(DrmIoctl::dg1GemCreateExt, nullptr), std::runtime_error);
1751-
}
1752-
17531765
TEST(DrmWrapperTest, WhenGettingDrmIoctlVersionValueThenIoctlHelperIsNotNeeded) {
17541766
EXPECT_EQ(getIoctlRequestValue(DrmIoctl::version, nullptr), static_cast<unsigned int>(DRM_IOCTL_VERSION));
17551767
}
17561768

1757-
TEST(DrmWrapperTest, WhenGettingChipsetIdParamValueThenIoctlHelperIsNotNeeded) {
1758-
EXPECT_EQ(getDrmParamValue(DrmParam::paramChipsetId, nullptr), static_cast<int>(I915_PARAM_CHIPSET_ID));
1759-
}
1760-
1761-
TEST(DrmWrapperTest, WhenGettingRevisionParamValueThenIoctlHelperIsNotNeeded) {
1762-
EXPECT_EQ(getDrmParamValue(DrmParam::paramRevision, nullptr), static_cast<int>(I915_PARAM_REVISION));
1763-
}
1764-
1765-
TEST(DrmWrapperTest, whenGettingDrmParamOrIoctlRequestValueThenUseIoctlHelperWhenAvailable) {
1766-
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
1767-
DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
1768-
1769-
MockIoctlHelper ioctlHelper{drm};
1770-
EXPECT_EQ(getIoctlRequestValue(DrmIoctl::getparam, &ioctlHelper), ioctlHelper.getIoctlRequestValueResult);
1771-
EXPECT_NE(getIoctlRequestValue(DrmIoctl::getparam, nullptr), getIoctlRequestValue(DrmIoctl::getparam, &ioctlHelper));
1772-
1773-
EXPECT_EQ(getDrmParamValue(DrmParam::paramChipsetId, &ioctlHelper), ioctlHelper.getDrmParamValueResult);
1774-
EXPECT_NE(getDrmParamValue(DrmParam::paramChipsetId, nullptr), getDrmParamValue(DrmParam::paramChipsetId, &ioctlHelper));
1775-
}
1776-
17771769
TEST(DrmWrapperTest, WhenGettingIoctlStringValueThenProperStringIsReturned) {
17781770
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
17791771
DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
17801772

17811773
MockIoctlHelper ioctlHelper{drm};
1782-
EXPECT_STREQ(getIoctlString(DrmIoctl::getparam, &ioctlHelper).c_str(), "DRM_IOCTL_I915_GETPARAM");
1783-
EXPECT_STREQ(getIoctlString(DrmIoctl::getparam, nullptr).c_str(), "DRM_IOCTL_I915_GETPARAM");
1774+
EXPECT_STREQ(ioctlHelper.getIoctlString(DrmIoctl::getparam).c_str(), "DRM_IOCTL_I915_GETPARAM");
17841775
}
17851776
TEST(DrmWrapperTest, WhenGettingDrmParamValueStringThenProperStringIsReturned) {
17861777
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
@@ -1794,16 +1785,8 @@ TEST(DrmWrapperTest, WhenGettingDrmParamValueStringThenProperStringIsReturned) {
17941785
{DrmParam::paramMinEuInPool, "I915_PARAM_MIN_EU_IN_POOL"},
17951786
{DrmParam::paramCsTimestampFrequency, "I915_PARAM_CS_TIMESTAMP_FREQUENCY"}};
17961787
for (auto &ioctlCodeString : ioctlCodeStringMap) {
1797-
EXPECT_STREQ(getDrmParamString(ioctlCodeString.first, &ioctlHelper).c_str(), ioctlCodeString.second);
1798-
EXPECT_THROW(getDrmParamString(ioctlCodeString.first, nullptr), std::runtime_error);
1788+
EXPECT_STREQ(ioctlHelper.getDrmParamString(ioctlCodeString.first).c_str(), ioctlCodeString.second);
17991789
}
1800-
1801-
EXPECT_STREQ(getDrmParamString(DrmParam::paramChipsetId, &ioctlHelper).c_str(), "I915_PARAM_CHIPSET_ID");
1802-
EXPECT_STREQ(getDrmParamString(DrmParam::paramChipsetId, nullptr).c_str(), "I915_PARAM_CHIPSET_ID");
1803-
EXPECT_STREQ(getDrmParamString(DrmParam::paramRevision, &ioctlHelper).c_str(), "I915_PARAM_REVISION");
1804-
EXPECT_STREQ(getDrmParamString(DrmParam::paramRevision, nullptr).c_str(), "I915_PARAM_REVISION");
1805-
1806-
EXPECT_THROW(getDrmParamString(DrmParam::engineClassRender, &ioctlHelper), std::runtime_error);
18071790
}
18081791

18091792
TEST(DrmHwInfoTest, givenTopologyDataWithoutSystemInfoWhenSettingHwInfoThenCorrectValuesAreSet) {

‎shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ DG1TEST_F(IoctlHelperTestsDg1, whenGettingDrmParamStringThenProperStringIsReturn
161161
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
162162
auto drm = std::make_unique<DrmMockProdDg1>(*executionEnvironment->rootDeviceEnvironments[0]);
163163
auto &ioctlHelper = *drm->getIoctlHelper();
164-
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID");
165-
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION");
166164
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU");
167165
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
168166
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramSubsliceTotal).c_str(), "I915_PARAM_SUBSLICE_TOTAL");

‎shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ TEST_F(IoctlPrelimHelperTests, whenGettingIoctlRequestValueThenPropertValueIsRet
9696
}
9797

9898
TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamStringThenProperStringIsReturned) {
99-
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID");
100-
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION");
10199
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU");
102100
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
103101
EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramSubsliceTotal).c_str(), "I915_PARAM_SUBSLICE_TOTAL");
@@ -175,8 +173,6 @@ TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamValueThenPropertValueIsReturne
175173
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::memoryClassSystem), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM));
176174
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWb), static_cast<int>(I915_MMAP_OFFSET_WB));
177175
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWc), static_cast<int>(I915_MMAP_OFFSET_WC));
178-
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramChipsetId), static_cast<int>(I915_PARAM_CHIPSET_ID));
179-
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramRevision), static_cast<int>(I915_PARAM_REVISION));
180176
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasPooledEu), static_cast<int>(I915_PARAM_HAS_POOLED_EU));
181177
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramEuTotal), static_cast<int>(I915_PARAM_EU_TOTAL));
182178
EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramSubsliceTotal), static_cast<int>(I915_PARAM_SUBSLICE_TOTAL));

0 commit comments

Comments
 (0)