refactor: correct naming of DrmParam enum values

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2025-12-20 17:00:59 +08:00 · 2023-12-13 09:05:31 +00:00
parent 9024e4a548
commit 2eba5b35e4
31 changed files with 524 additions and 524 deletions
--- a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h
@@ -40,11 +40,11 @@ struct MockSchedulerNeoDrm : public Drm {

    bool sysmanQueryEngineInfo() override {

-        uint16_t engineClassCopy = ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy);
-        uint16_t engineClassCompute = ioctlHelper->getDrmParamValue(DrmParam::EngineClassCompute);
-        uint16_t engineClassVideo = ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideo);
-        uint16_t engineClassVideoEnhance = ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideoEnhance);
-        uint16_t engineClassInvalid = ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalid);
+        uint16_t engineClassCopy = ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy);
+        uint16_t engineClassCompute = ioctlHelper->getDrmParamValue(DrmParam::engineClassCompute);
+        uint16_t engineClassVideo = ioctlHelper->getDrmParamValue(DrmParam::engineClassVideo);
+        uint16_t engineClassVideoEnhance = ioctlHelper->getDrmParamValue(DrmParam::engineClassVideoEnhance);
+        uint16_t engineClassInvalid = ioctlHelper->getDrmParamValue(DrmParam::engineClassInvalid);

        // Fill distanceInfos vector with dummy values
        std::vector<NEO::DistanceInfo> distanceInfos = {
--- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp
+++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp
@@ -55,7 +55,7 @@ class DrmPrelimMock : public DrmMock {
    }

    bool queryEngineInfo() override {
-        uint16_t computeEngineClass = getIoctlHelper()->getDrmParamValue(DrmParam::EngineClassCompute);
+        uint16_t computeEngineClass = getIoctlHelper()->getDrmParamValue(DrmParam::engineClassCompute);
        std::vector<EngineCapabilities> engines(4);
        engines[0].engine = {computeEngineClass, 0};
        engines[0].capabilities = 0;
@@ -86,7 +86,7 @@ class DrmPrelimMock : public DrmMock {
    }

    bool queryEngineInfo1SubDevice() {
-        uint16_t computeEngineClass = getIoctlHelper()->getDrmParamValue(DrmParam::EngineClassCompute);
+        uint16_t computeEngineClass = getIoctlHelper()->getDrmParamValue(DrmParam::engineClassCompute);
        std::vector<EngineCapabilities> engines(1);
        engines[0].engine = {computeEngineClass, 0};
        engines[0].capabilities = 0;
--- a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h
@@ -38,11 +38,11 @@ struct MockSchedulerNeoDrm : public Drm {

    bool sysmanQueryEngineInfo() override {

-        uint16_t engineClassCopy = ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy);
-        uint16_t engineClassCompute = ioctlHelper->getDrmParamValue(DrmParam::EngineClassCompute);
-        uint16_t engineClassVideo = ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideo);
-        uint16_t engineClassVideoEnhance = ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideoEnhance);
-        uint16_t engineClassInvalid = ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalid);
+        uint16_t engineClassCopy = ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy);
+        uint16_t engineClassCompute = ioctlHelper->getDrmParamValue(DrmParam::engineClassCompute);
+        uint16_t engineClassVideo = ioctlHelper->getDrmParamValue(DrmParam::engineClassVideo);
+        uint16_t engineClassVideoEnhance = ioctlHelper->getDrmParamValue(DrmParam::engineClassVideoEnhance);
+        uint16_t engineClassInvalid = ioctlHelper->getDrmParamValue(DrmParam::engineClassInvalid);

        // Fill distanceInfos vector with dummy values
        std::vector<NEO::DistanceInfo> distanceInfos = {
--- a/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp
+++ b/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp
@@ -352,7 +352,7 @@ HWTEST_F(ClDrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageWithMipCount
    EXPECT_EQ(1u, this->mock->createParamsHandle);
    EXPECT_EQ(imageSize, this->mock->createParamsSize);
    auto ioctlHelper = this->mock->getIoctlHelper();
-    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::TilingY);
+    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::tilingY);
    EXPECT_EQ(tilingMode, this->mock->setTilingMode);
    EXPECT_EQ(rowPitch, this->mock->setTilingStride);
    EXPECT_EQ(1u, this->mock->setTilingHandle);
@@ -402,7 +402,7 @@ HWTEST_F(ClDrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageWithMipCount
    EXPECT_EQ(1u, this->mock->createParamsHandle);
    EXPECT_EQ(imageSize, this->mock->createParamsSize);
    auto ioctlHelper = this->mock->getIoctlHelper();
-    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::TilingY);
+    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::tilingY);
    EXPECT_EQ(tilingMode, this->mock->setTilingMode);
    EXPECT_EQ(rowPitch, this->mock->setTilingStride);
    EXPECT_EQ(1u, this->mock->setTilingHandle);
@@ -517,7 +517,7 @@ HWTEST_F(ClDrmMemoryManagerTest, givenDrmMemoryManagerWhenTiledImageIsBeingCreat
    EXPECT_EQ(1u, this->mock->createParamsHandle);
    EXPECT_EQ(imageSize, this->mock->createParamsSize);
    auto ioctlHelper = this->mock->getIoctlHelper();
-    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::TilingY);
+    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::tilingY);
    EXPECT_EQ(tilingMode, this->mock->setTilingMode);
    EXPECT_EQ(rowPitch, this->mock->setTilingStride);
    EXPECT_EQ(1u, this->mock->setTilingHandle);
@@ -595,7 +595,7 @@ TEST_F(ClDrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountZ
    EXPECT_EQ(0u, this->mock->createParamsHandle);
    EXPECT_EQ(0u, this->mock->createParamsSize);
    auto ioctlHelper = this->mock->getIoctlHelper();
-    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::TilingNone);
+    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::tilingNone);
    EXPECT_EQ(tilingMode, this->mock->setTilingMode);
    EXPECT_EQ(0u, this->mock->setTilingStride);
    EXPECT_EQ(0u, this->mock->setTilingHandle);
@@ -645,7 +645,7 @@ TEST_F(ClDrmMemoryManagerTest, givenDrmMemoryManagerWhenNonTiledImgWithMipCountN
    EXPECT_EQ(0u, this->mock->createParamsHandle);
    EXPECT_EQ(0u, this->mock->createParamsSize);
    auto ioctlHelper = this->mock->getIoctlHelper();
-    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::TilingNone);
+    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::tilingNone);
    EXPECT_EQ(tilingMode, this->mock->setTilingMode);
    EXPECT_EQ(0u, this->mock->setTilingStride);
    EXPECT_EQ(0u, this->mock->setTilingHandle);
@@ -688,7 +688,7 @@ TEST_F(ClDrmMemoryManagerTest, givenDrmMemoryManagerWhen1DarrayImageIsBeingCreat
    EXPECT_EQ(0u, this->mock->createParamsHandle);
    EXPECT_EQ(0u, this->mock->createParamsSize);
    auto ioctlHelper = this->mock->getIoctlHelper();
-    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::TilingNone);
+    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::tilingNone);
    EXPECT_EQ(tilingMode, this->mock->setTilingMode);
    EXPECT_EQ(0u, this->mock->setTilingStride);
    EXPECT_EQ(0u, this->mock->setTilingHandle);
@@ -745,7 +745,7 @@ TEST_F(ClDrmMemoryManagerTest, givenOsHandleWithNonTiledObjectWhenCreateFromShar
    mock->ioctlExpected.gemClose = 1;
    mock->ioctlExpected.gemGetTiling = 1;
    auto ioctlHelper = this->mock->getIoctlHelper();
-    mock->getTilingModeOut = ioctlHelper->getDrmParamValue(DrmParam::TilingNone);
+    mock->getTilingModeOut = ioctlHelper->getDrmParamValue(DrmParam::tilingNone);

    osHandle handle = 1u;
    uint32_t boHandle = 2u;
@@ -788,7 +788,7 @@ TEST_F(ClDrmMemoryManagerTest, givenOsHandleWithTileYObjectWhenCreateFromSharedH
    mock->ioctlExpected.gemClose = 1;
    mock->ioctlExpected.gemGetTiling = 1;
    auto ioctlHelper = this->mock->getIoctlHelper();
-    mock->getTilingModeOut = ioctlHelper->getDrmParamValue(DrmParam::TilingY);
+    mock->getTilingModeOut = ioctlHelper->getDrmParamValue(DrmParam::tilingY);

    osHandle handle = 1u;
    uint32_t boHandle = 2u;
--- a/shared/source/direct_submission/linux/drm_direct_submission.inl
+++ b/shared/source/direct_submission/linux/drm_direct_submission.inl
@@ -128,7 +128,7 @@ bool DrmDirectSubmission<GfxFamily, Dispatcher>::submit(uint64_t gpuAddress, siz

    auto osContextLinux = static_cast<OsContextLinux *>(&this->osContext);
    auto &drm = osContextLinux->getDrm();
-    auto execFlags = osContextLinux->getEngineFlag() | drm.getIoctlHelper()->getDrmParamValue(DrmParam::ExecNoReloc);
+    auto execFlags = osContextLinux->getEngineFlag() | drm.getIoctlHelper()->getDrmParamValue(DrmParam::execNoReloc);
    auto &drmContextIds = osContextLinux->getDrmContextIds();

    ExecObject execObject{};
--- a/shared/source/os_interface/linux/drm_allocation.cpp
+++ b/shared/source/os_interface/linux/drm_allocation.cpp
@@ -196,7 +196,7 @@ bool DrmAllocation::prefetchBOWithChunking(Drm *drm) {
    auto bo = this->getBO();

    auto ioctlHelper = drm->getIoctlHelper();
-    auto memoryClassDevice = ioctlHelper->getDrmParamValue(DrmParam::MemoryClassDevice);
+    auto memoryClassDevice = ioctlHelper->getDrmParamValue(DrmParam::memoryClassDevice);
    auto subDeviceIds = getSubDeviceIds(storageInfo.subDeviceBitfield);

    uint32_t chunksPerSubDevice = this->storageInfo.numOfChunks / subDeviceIds.size();
@@ -302,7 +302,7 @@ int DrmAllocation::bindBOs(OsContext *osContext, uint32_t vmHandleId, std::vecto
 bool DrmAllocation::prefetchBO(BufferObject *bo, uint32_t vmHandleId, uint32_t subDeviceId) {
    auto drm = bo->peekDrm();
    auto ioctlHelper = drm->getIoctlHelper();
-    auto memoryClassDevice = ioctlHelper->getDrmParamValue(DrmParam::MemoryClassDevice);
+    auto memoryClassDevice = ioctlHelper->getDrmParamValue(DrmParam::memoryClassDevice);
    auto region = static_cast<uint32_t>((memoryClassDevice << 16u) | subDeviceId);
    auto vmId = drm->getVirtualMemoryAddressSpace(vmHandleId);

--- a/shared/source/os_interface/linux/drm_buffer_object.cpp
+++ b/shared/source/os_interface/linux/drm_buffer_object.cpp
@@ -84,7 +84,7 @@ BufferObject::BufferObject(uint32_t rootDeviceIndex, Drm *drm, uint64_t patIndex
    : drm(drm), refCount(1), rootDeviceIndex(rootDeviceIndex), handle(std::move(handle)), size(size) {

    auto ioctlHelper = drm->getIoctlHelper();
-    this->tilingMode = ioctlHelper->getDrmParamValue(DrmParam::TilingNone);
+    this->tilingMode = ioctlHelper->getDrmParamValue(DrmParam::tilingNone);
    this->lockedAddress = nullptr;
    this->patIndex = patIndex;

--- a/shared/source/os_interface/linux/drm_command_stream.inl
+++ b/shared/source/os_interface/linux/drm_command_stream.inl
@@ -225,7 +225,7 @@ int DrmCommandStreamReceiver<GfxFamily>::exec(const BatchBuffer &batchBuffer, ui
    DEBUG_BREAK_IF(!bb);

    auto osContextLinux = static_cast<OsContextLinux *>(this->osContext);
-    auto execFlags = osContextLinux->getEngineFlag() | drm->getIoctlHelper()->getDrmParamValue(DrmParam::ExecNoReloc);
+    auto execFlags = osContextLinux->getEngineFlag() | drm->getIoctlHelper()->getDrmParamValue(DrmParam::execNoReloc);

    // requiredSize determinant:
    // * vmBind UNAVAILABLE => residency holds all allocations except for the command buffer
--- a/shared/source/os_interface/linux/drm_engine_mapper.cpp
+++ b/shared/source/os_interface/linux/drm_engine_mapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -15,11 +15,11 @@ namespace NEO {

 DrmParam DrmEngineMapper::engineNodeMap(aub_stream::EngineType engineType) {
    if (EngineHelpers::isCcs(engineType)) {
-        return DrmParam::ExecDefault;
+        return DrmParam::execDefault;
    } else if (aub_stream::ENGINE_BCS == engineType || EngineHelpers::isLinkBcs(engineType)) {
-        return DrmParam::ExecBlt;
+        return DrmParam::execBlt;
    }
    UNRECOVERABLE_IF(engineType != aub_stream::ENGINE_RCS && engineType != aub_stream::ENGINE_CCCS);
-    return DrmParam::ExecRender;
+    return DrmParam::execRender;
 }
 } // namespace NEO
--- a/shared/source/os_interface/linux/drm_memory_manager.cpp
+++ b/shared/source/os_interface/linux/drm_memory_manager.cpp
@@ -679,7 +679,7 @@ GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryForImageImpl(const A
    }
    bo->setAddress(gpuRange);

-    [[maybe_unused]] auto ret2 = bo->setTiling(ioctlHelper->getDrmParamValue(DrmParam::TilingY), static_cast<uint32_t>(allocationData.imgInfo->rowPitch));
+    [[maybe_unused]] auto ret2 = bo->setTiling(ioctlHelper->getDrmParamValue(DrmParam::tilingY), static_cast<uint32_t>(allocationData.imgInfo->rowPitch));
    DEBUG_BREAK_IF(ret2 != true);

    auto allocation = new DrmAllocation(allocationData.rootDeviceIndex, allocationData.type, bo.get(), nullptr, gpuRange, allocationData.imgInfo->size, memoryPool);
@@ -1055,7 +1055,7 @@ GraphicsAllocation *DrmMemoryManager::createGraphicsAllocationFromSharedHandle(o
        ret = ioctlHelper->getGemTiling(&getTiling);

        if (ret) {
-            if (getTiling.tilingMode == static_cast<uint32_t>(ioctlHelper->getDrmParamValue(DrmParam::TilingNone))) {
+            if (getTiling.tilingMode == static_cast<uint32_t>(ioctlHelper->getDrmParamValue(DrmParam::tilingNone))) {
                properties.imgInfo->linearStorage = true;
            }
        }
@@ -2166,7 +2166,7 @@ DrmAllocation *DrmMemoryManager::createAllocWithAlignment(const AllocationData &

        uint64_t offset = 0;
        auto ioctlHelper = drm.getIoctlHelper();
-        uint64_t mmapOffsetWb = ioctlHelper->getDrmParamValue(DrmParam::MmapOffsetWb);
+        uint64_t mmapOffsetWb = ioctlHelper->getDrmParamValue(DrmParam::mmapOffsetWb);
        if (!retrieveMmapOffsetForBufferObject(allocationData.rootDeviceIndex, *bo, mmapOffsetWb, offset)) {
            releaseGpuRange(reinterpret_cast<void *>(preferredAddress), totalSizeToAlloc, allocationData.rootDeviceIndex);
            this->munmapFunction(cpuPointer, size);
@@ -2219,7 +2219,7 @@ void *DrmMemoryManager::lockBufferObject(BufferObject *bo) {
    auto rootDeviceIndex = this->getRootDeviceIndex(drm);

    auto ioctlHelper = drm->getIoctlHelper();
-    uint64_t mmapOffsetWc = ioctlHelper->getDrmParamValue(DrmParam::MmapOffsetWc);
+    uint64_t mmapOffsetWc = ioctlHelper->getDrmParamValue(DrmParam::mmapOffsetWc);
    uint64_t offset = 0;
    if (!retrieveMmapOffsetForBufferObject(rootDeviceIndex, *bo, mmapOffsetWc, offset)) {
        return nullptr;
@@ -2362,7 +2362,7 @@ GraphicsAllocation *DrmMemoryManager::createSharedUnifiedMemoryAllocation(const
            return nullptr;
        }

-        uint64_t mmapOffsetWb = ioctlHelper->getDrmParamValue(DrmParam::MmapOffsetWb);
+        uint64_t mmapOffsetWb = ioctlHelper->getDrmParamValue(DrmParam::mmapOffsetWb);
        uint64_t offset = 0;
        if (!retrieveMmapOffsetForBufferObject(allocationData.rootDeviceIndex, *bo, mmapOffsetWb, offset)) {
            this->munmapFunction(cpuBasePointer, totalSizeToAlloc);
@@ -2503,7 +2503,7 @@ DrmAllocation *DrmMemoryManager::createUSMHostAllocationFromSharedHandle(osHandl

        bo->setAddress(reinterpret_cast<uintptr_t>(cpuPointer));

-        uint64_t mmapOffsetWb = ioctlHelper->getDrmParamValue(DrmParam::MmapOffsetWb);
+        uint64_t mmapOffsetWb = ioctlHelper->getDrmParamValue(DrmParam::mmapOffsetWb);
        uint64_t offset = 0;
        if (!retrieveMmapOffsetForBufferObject(properties.rootDeviceIndex, *bo, mmapOffsetWb, offset)) {
            this->munmapFunction(cpuPointer, size);
--- a/shared/source/os_interface/linux/drm_neo.cpp
+++ b/shared/source/os_interface/linux/drm_neo.cpp
@@ -156,19 +156,19 @@ int Drm::getParamIoctl(DrmParam param, int *dstValue) {
 }

 int Drm::getExecSoftPin(int &execSoftPin) {
-    return getParamIoctl(DrmParam::ParamHasExecSoftpin, &execSoftPin);
+    return getParamIoctl(DrmParam::paramHasExecSoftpin, &execSoftPin);
 }

 bool Drm::queryI915DeviceIdAndRevision() {
    HardwareInfo *hwInfo = rootDeviceEnvironment.getMutableHardwareInfo();
    int deviceId = hwInfo->platform.usDeviceID;
    int revisionId = hwInfo->platform.usRevId;
-    auto ret = getParamIoctl(DrmParam::ParamChipsetId, &deviceId);
+    auto ret = getParamIoctl(DrmParam::paramChipsetId, &deviceId);
    if (ret != 0) {
        printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query device ID parameter!\n");
        return false;
    }
-    ret = getParamIoctl(DrmParam::ParamRevision, &revisionId);
+    ret = getParamIoctl(DrmParam::paramRevision, &revisionId);
    if (ret != 0) {
        printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query device Rev ID parameter!\n");
        return false;
@@ -187,7 +187,7 @@ int Drm::enableTurboBoost() {
 }

 int Drm::getEnabledPooledEu(int &enabled) {
-    return getParamIoctl(DrmParam::ParamHasPooledEu, &enabled);
+    return getParamIoctl(DrmParam::paramHasPooledEu, &enabled);
 }

 std::string Drm::getSysFsPciPath() {
@@ -227,7 +227,7 @@ bool Drm::readSysFsAsString(const std::string &relativeFilePath, std::string &re

 int Drm::queryGttSize(uint64_t &gttSizeOutput) {
    GemContextParam contextParam = {0};
-    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamGttSize);
+    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamGttSize);

    int ret = ioctlHelper->ioctl(DrmIoctl::gemContextGetparam, &contextParam);
    if (ret == 0) {
@@ -260,8 +260,8 @@ bool Drm::isGpuHangDetected(OsContext &osContext) {

 void Drm::checkPreemptionSupport() {
    int value = 0;
-    auto ret = getParamIoctl(DrmParam::ParamHasScheduler, &value);
-    auto schedulerCapPreemption = ioctlHelper->getDrmParamValue(DrmParam::SchedulerCapPreemption);
+    auto ret = getParamIoctl(DrmParam::paramHasScheduler, &value);
+    auto schedulerCapPreemption = ioctlHelper->getDrmParamValue(DrmParam::schedulerCapPreemption);
    preemptionSupported = ((0 == ret) && (value & schedulerCapPreemption));
 }

@@ -272,7 +272,7 @@ void Drm::checkQueueSliceSupport() {
 void Drm::setLowPriorityContextParam(uint32_t drmContextId) {
    GemContextParam gcp = {};
    gcp.contextId = drmContextId;
-    gcp.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamPriority);
+    gcp.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamPriority);
    gcp.value = -1023;

    auto retVal = ioctlHelper->ioctl(DrmIoctl::gemContextSetparam, &gcp);
@@ -281,9 +281,9 @@ void Drm::setLowPriorityContextParam(uint32_t drmContextId) {

 int Drm::getQueueSliceCount(GemContextParamSseu *sseu) {
    GemContextParam contextParam = {};
-    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamSseu);
-    sseu->engine.engineClass = ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender);
-    sseu->engine.engineInstance = ioctlHelper->getDrmParamValue(DrmParam::ExecDefault);
+    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamSseu);
+    sseu->engine.engineClass = ioctlHelper->getDrmParamValue(DrmParam::engineClassRender);
+    sseu->engine.engineInstance = ioctlHelper->getDrmParamValue(DrmParam::execDefault);
    contextParam.value = reinterpret_cast<uint64_t>(sseu);
    contextParam.size = sizeof(struct GemContextParamSseu);

@@ -298,7 +298,7 @@ bool Drm::setQueueSliceCount(uint64_t sliceCount) {
        GemContextParam contextParam = {};
        sseu.sliceMask = getSliceMask(sliceCount);

-        contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamSseu);
+        contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamSseu);
        contextParam.contextId = 0;
        contextParam.value = reinterpret_cast<uint64_t>(&sseu);
        contextParam.size = sizeof(struct GemContextParamSseu);
@@ -312,7 +312,7 @@ bool Drm::setQueueSliceCount(uint64_t sliceCount) {

 void Drm::checkNonPersistentContextsSupport() {
    GemContextParam contextParam = {};
-    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamPersistence);
+    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamPersistence);

    auto retVal = ioctlHelper->ioctl(DrmIoctl::gemContextGetparam, &contextParam);
    if (retVal == 0 && contextParam.value == 1) {
@@ -325,7 +325,7 @@ void Drm::checkNonPersistentContextsSupport() {
 void Drm::setNonPersistentContext(uint32_t drmContextId) {
    GemContextParam contextParam = {};
    contextParam.contextId = drmContextId;
-    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamPersistence);
+    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamPersistence);

    ioctlHelper->ioctl(DrmIoctl::gemContextSetparam, &contextParam);
 }
@@ -333,7 +333,7 @@ void Drm::setNonPersistentContext(uint32_t drmContextId) {
 void Drm::setUnrecoverableContext(uint32_t drmContextId) {
    GemContextParam contextParam = {};
    contextParam.contextId = drmContextId;
-    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamRecoverable);
+    contextParam.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamRecoverable);
    contextParam.value = 0;
    contextParam.size = 0;

@@ -353,11 +353,11 @@ int Drm::createDrmContext(uint32_t drmVmId, bool isDirectSubmissionRequested, bo
    GemContextCreateExtSetParam extSetparam = {};

    if (drmVmId > 0) {
-        extSetparam.base.name = ioctlHelper->getDrmParamValue(DrmParam::ContextCreateExtSetparam);
-        extSetparam.param.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamVm);
+        extSetparam.base.name = ioctlHelper->getDrmParamValue(DrmParam::contextCreateExtSetparam);
+        extSetparam.param.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamVm);
        extSetparam.param.value = drmVmId;
        gcc.extensions = reinterpret_cast<uint64_t>(&extSetparam);
-        gcc.flags |= ioctlHelper->getDrmParamValue(DrmParam::ContextCreateFlagsUseExtensions);
+        gcc.flags |= ioctlHelper->getDrmParamValue(DrmParam::contextCreateFlagsUseExtensions);
    }

    if (debugManager.flags.CreateContextWithAccessCounters.get() > 0) {
@@ -398,7 +398,7 @@ int Drm::queryVmId(uint32_t drmContextId, uint32_t &vmId) {
    GemContextParam param{};
    param.contextId = drmContextId;
    param.value = 0;
-    param.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamVm);
+    param.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamVm);
    auto retVal = ioctlHelper->ioctl(DrmIoctl::gemContextGetparam, &param);

    vmId = static_cast<uint32_t>(param.value);
@@ -411,15 +411,15 @@ std::unique_lock<std::mutex> Drm::lockBindFenceMutex() {
 }

 int Drm::getEuTotal(int &euTotal) {
-    return getParamIoctl(DrmParam::ParamEuTotal, &euTotal);
+    return getParamIoctl(DrmParam::paramEuTotal, &euTotal);
 }

 int Drm::getSubsliceTotal(int &subsliceTotal) {
-    return getParamIoctl(DrmParam::ParamSubsliceTotal, &subsliceTotal);
+    return getParamIoctl(DrmParam::paramSubsliceTotal, &subsliceTotal);
 }

 int Drm::getMinEuInPool(int &minEUinPool) {
-    return getParamIoctl(DrmParam::ParamMinEuInPool, &minEUinPool);
+    return getParamIoctl(DrmParam::paramMinEuInPool, &minEUinPool);
 }

 int Drm::getErrno() {
@@ -766,12 +766,12 @@ int Drm::waitHandle(uint32_t waitHandle, int64_t timeout) {

 int Drm::getTimestampFrequency(int &frequency) {
    frequency = 0;
-    return getParamIoctl(DrmParam::ParamCsTimestampFrequency, &frequency);
+    return getParamIoctl(DrmParam::paramCsTimestampFrequency, &frequency);
 }

 int Drm::getOaTimestampFrequency(int &frequency) {
    frequency = 0;
-    return getParamIoctl(DrmParam::ParamOATimestampFrequency, &frequency);
+    return getParamIoctl(DrmParam::paramOATimestampFrequency, &frequency);
 }

 bool Drm::queryEngineInfo() {
@@ -949,7 +949,7 @@ int Drm::waitUserFence(uint32_t ctxId, uint64_t address, uint64_t value, ValueWi
 }

 bool Drm::querySystemInfo() {
-    auto request = ioctlHelper->getDrmParamValue(DrmParam::QueryHwconfigTable);
+    auto request = ioctlHelper->getDrmParamValue(DrmParam::queryHwconfigTable);
    auto deviceBlobQuery = this->query<uint32_t>(request, 0);
    if (deviceBlobQuery.empty()) {
        PRINT_DEBUG_STRING(debugManager.flags.PrintDebugMessages.get(), stdout, "%s", "INFO: System Info query failed!\n");
@@ -960,7 +960,7 @@ bool Drm::querySystemInfo() {
 }

 std::vector<uint64_t> Drm::getMemoryRegions() {
-    auto request = ioctlHelper->getDrmParamValue(DrmParam::QueryMemoryRegions);
+    auto request = ioctlHelper->getDrmParamValue(DrmParam::queryMemoryRegions);
    return this->query<uint64_t>(request, 0);
 }

@@ -1079,14 +1079,14 @@ unsigned int Drm::bindDrmContext(uint32_t drmContextId, uint32_t deviceIndex, au

    bool setupVirtualEngines = false;
    unsigned int engineCount = static_cast<unsigned int>(numberOfCCS);
-    if (useVirtualEnginesForCcs && engine->engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCompute) && numberOfCCS > 1u) {
+    if (useVirtualEnginesForCcs && engine->engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCompute) && numberOfCCS > 1u) {
        numEnginesInContext = numberOfCCS + 1;
        balancer.numSiblings = numberOfCCS;
        setupVirtualEngines = true;
    }

    bool includeMainCopyEngineInGroup = false;
-    if (useVirtualEnginesForBcs && engine->engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy) && numberOfBCS > 1u) {
+    if (useVirtualEnginesForBcs && engine->engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy) && numberOfBCS > 1u) {
        numEnginesInContext = static_cast<uint32_t>(numberOfBCS) + 1;
        balancer.numSiblings = numberOfBCS;
        setupVirtualEngines = true;
@@ -1101,13 +1101,13 @@ unsigned int Drm::bindDrmContext(uint32_t drmContextId, uint32_t deviceIndex, au
    }

    if (setupVirtualEngines) {
-        balancer.base.name = ioctlHelper->getDrmParamValue(DrmParam::ContextEnginesExtLoadBalance);
+        balancer.base.name = ioctlHelper->getDrmParamValue(DrmParam::contextEnginesExtLoadBalance);
        contextEngines.extensions = castToUint64(&balancer);
-        contextEngines.engines[0].engineClass = ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalid);
-        contextEngines.engines[0].engineInstance = ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalidNone);
+        contextEngines.engines[0].engineClass = ioctlHelper->getDrmParamValue(DrmParam::engineClassInvalid);
+        contextEngines.engines[0].engineInstance = ioctlHelper->getDrmParamValue(DrmParam::engineClassInvalidNone);

        for (auto engineIndex = 0u; engineIndex < engineCount; engineIndex++) {
-            if (useVirtualEnginesForBcs && engine->engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)) {
+            if (useVirtualEnginesForBcs && engine->engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)) {
                auto mappedBcsEngineType = static_cast<aub_stream::EngineType>(EngineHelpers::mapBcsIndexToEngineType(engineIndex, includeMainCopyEngineInGroup));
                bool isBcsEnabled = rootDeviceEnvironment.getHardwareInfo()->featureTable.ftrBcsInfo.test(EngineHelpers::getBcsIndex(mappedBcsEngineType));

@@ -1119,7 +1119,7 @@ unsigned int Drm::bindDrmContext(uint32_t drmContextId, uint32_t deviceIndex, au
            }
            UNRECOVERABLE_IF(!engine);

-            if (useVirtualEnginesForCcs && engine->engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCompute)) {
+            if (useVirtualEnginesForCcs && engine->engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCompute)) {
                engine = engineInfo->getEngineInstance(deviceIndex, static_cast<aub_stream::EngineType>(EngineHelpers::mapCcsIndexToEngineType(engineIndex)));
            }
            UNRECOVERABLE_IF(!engine);
@@ -1131,13 +1131,13 @@ unsigned int Drm::bindDrmContext(uint32_t drmContextId, uint32_t deviceIndex, au
    GemContextParam param{};
    param.contextId = drmContextId;
    param.size = static_cast<uint32_t>(ptrDiff(contextEngines.engines + numEnginesInContext, &contextEngines));
-    param.param = ioctlHelper->getDrmParamValue(DrmParam::ContextParamEngines);
+    param.param = ioctlHelper->getDrmParamValue(DrmParam::contextParamEngines);
    param.value = castToUint64(&contextEngines);

    auto ioctlValue = ioctlHelper->ioctl(DrmIoctl::gemContextSetparam, &param);
    UNRECOVERABLE_IF(ioctlValue != 0);

-    retVal = static_cast<unsigned int>(ioctlHelper->getDrmParamValue(DrmParam::ExecDefault));
+    retVal = static_cast<unsigned int>(ioctlHelper->getDrmParamValue(DrmParam::execDefault));
    return retVal;
 }

--- a/shared/source/os_interface/linux/drm_wrappers.cpp
+++ b/shared/source/os_interface/linux/drm_wrappers.cpp
@@ -41,9 +41,9 @@ int getDrmParamValue(DrmParam drmParam, IoctlHelper *ioctlHelper) {
        return ioctlHelper->getDrmParamValue(drmParam);
    }
    switch (drmParam) {
-    case DrmParam::ParamChipsetId:
+    case DrmParam::paramChipsetId:
        return I915_PARAM_CHIPSET_ID;
-    case DrmParam::ParamRevision:
+    case DrmParam::paramRevision:
        return I915_PARAM_REVISION;
    default:
        UNRECOVERABLE_IF(true);
@@ -56,9 +56,9 @@ std::string getDrmParamString(DrmParam drmParam, IoctlHelper *ioctlHelper) {
        return ioctlHelper->getDrmParamString(drmParam);
    }
    switch (drmParam) {
-    case DrmParam::ParamChipsetId:
+    case DrmParam::paramChipsetId:
        return "I915_PARAM_CHIPSET_ID";
-    case DrmParam::ParamRevision:
+    case DrmParam::paramRevision:
        return "I915_PARAM_REVISION";
    default:
        UNRECOVERABLE_IF(true);
--- a/shared/source/os_interface/linux/drm_wrappers.h
+++ b/shared/source/os_interface/linux/drm_wrappers.h
@@ -265,51 +265,51 @@ enum class DrmIoctl {
 };

 enum class DrmParam {
-    ContextCreateExtSetparam,
-    ContextCreateFlagsUseExtensions,
-    ContextEnginesExtLoadBalance,
-    ContextParamEngines,
-    ContextParamGttSize,
-    ContextParamPersistence,
-    ContextParamPriority,
-    ContextParamRecoverable,
-    ContextParamSseu,
-    ContextParamVm,
-    EngineClassRender,
-    EngineClassCompute,
-    EngineClassCopy,
-    EngineClassVideo,
-    EngineClassVideoEnhance,
-    EngineClassInvalid,
-    EngineClassInvalidNone,
-    ExecBlt,
-    ExecDefault,
-    ExecNoReloc,
-    ExecRender,
-    MemoryClassDevice,
-    MemoryClassSystem,
-    MmapOffsetWb,
-    MmapOffsetWc,
-    ParamChipsetId,
-    ParamRevision,
-    ParamHasExecSoftpin,
-    ParamHasPooledEu,
-    ParamHasScheduler,
-    ParamEuTotal,
-    ParamSubsliceTotal,
-    ParamMinEuInPool,
-    ParamCsTimestampFrequency,
-    ParamOATimestampFrequency,
-    ParamHasVmBind,
-    ParamHasPageFault,
-    QueryEngineInfo,
-    QueryHwconfigTable,
-    QueryComputeSlices,
-    QueryMemoryRegions,
-    QueryTopologyInfo,
-    SchedulerCapPreemption,
-    TilingNone,
-    TilingY,
+    contextCreateExtSetparam,
+    contextCreateFlagsUseExtensions,
+    contextEnginesExtLoadBalance,
+    contextParamEngines,
+    contextParamGttSize,
+    contextParamPersistence,
+    contextParamPriority,
+    contextParamRecoverable,
+    contextParamSseu,
+    contextParamVm,
+    engineClassRender,
+    engineClassCompute,
+    engineClassCopy,
+    engineClassVideo,
+    engineClassVideoEnhance,
+    engineClassInvalid,
+    engineClassInvalidNone,
+    execBlt,
+    execDefault,
+    execNoReloc,
+    execRender,
+    memoryClassDevice,
+    memoryClassSystem,
+    mmapOffsetWb,
+    mmapOffsetWc,
+    paramChipsetId,
+    paramRevision,
+    paramHasExecSoftpin,
+    paramHasPooledEu,
+    paramHasScheduler,
+    paramEuTotal,
+    paramSubsliceTotal,
+    paramMinEuInPool,
+    paramCsTimestampFrequency,
+    paramOATimestampFrequency,
+    paramHasVmBind,
+    paramHasPageFault,
+    queryEngineInfo,
+    queryHwconfigTable,
+    queryComputeSlices,
+    queryMemoryRegions,
+    queryTopologyInfo,
+    schedulerCapPreemption,
+    tilingNone,
+    tilingY,
 };

 unsigned int getIoctlRequestValue(DrmIoctl ioctlRequest, IoctlHelper *ioctlHelper);
--- a/shared/source/os_interface/linux/engine_info.cpp
+++ b/shared/source/os_interface/linux/engine_info.cpp
@@ -61,13 +61,13 @@ EngineInfo::EngineInfo(Drm *drm, const std::vector<EngineCapabilities> &engineIn
    for (const auto &engineInfo : engineInfos) {
        auto &engine = engineInfo.engine;
        tileToEngineMap.emplace(0, engine);
-        if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)) {
+        if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)) {
            tileToEngineToInstanceMap[0][EngineHelpers::remapEngineTypeToHwSpecific(aub_stream::EngineType::ENGINE_RCS, rootDeviceEnvironment)] = engine;
-        } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)) {
+        } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)) {
            const auto &hwInfo = rootDeviceEnvironment.getHardwareInfo();
            assignCopyEngine(EngineInfo::getBaseCopyEngineType(ioctlHelper, engineInfo.capabilities, hwInfo->capabilityTable.isIntegratedDevice), 0, engine,
                             bcsInfoMask, numHostLinkCopyEngines, numScaleUpLinkCopyEngines);
-        } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCompute)) {
+        } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCompute)) {
            tileToEngineToInstanceMap[0][static_cast<aub_stream::EngineType>(aub_stream::ENGINE_CCS + computeEngines)] = engine;
            computeEngines++;
        }
@@ -85,12 +85,12 @@ EngineInfo::EngineInfo(Drm *drm, const StackVec<std::vector<EngineClassInstance>
        computeEnginesPerTile = 0u;
        for (const auto &engine : engineClassInstancePerTile[tile]) {
            tileToEngineMap.emplace(tile, engine);
-            if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)) {
+            if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)) {
                tileToEngineToInstanceMap[tile][EngineHelpers::remapEngineTypeToHwSpecific(aub_stream::EngineType::ENGINE_RCS, rootDeviceEnvironment)] = engine;
-            } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)) {
+            } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)) {
                tileToEngineToInstanceMap[tile][DrmEngineMappingHelper::engineMapping[copyEnginesPerTile]] = engine;
                copyEnginesPerTile++;
-            } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCompute)) {
+            } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCompute)) {
                tileToEngineToInstanceMap[tile][static_cast<aub_stream::EngineType>(aub_stream::ENGINE_CCS + computeEnginesPerTile)] = engine;
                computeEnginesPerTile++;
            }
@@ -118,12 +118,12 @@ EngineInfo::EngineInfo(Drm *drm, uint32_t tileCount, const std::vector<DistanceI

        auto engine = distanceInfos[i].engine;
        tileToEngineMap.emplace(tile, engine);
-        if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)) {
+        if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)) {
            tileToEngineToInstanceMap[tile][EngineHelpers::remapEngineTypeToHwSpecific(aub_stream::EngineType::ENGINE_RCS, rootDeviceEnvironment)] = engine;
-        } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)) {
+        } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)) {
            tileToEngineToInstanceMap[tile][DrmEngineMappingHelper::engineMapping[copyEnginesPerTile]] = engine;
            copyEnginesPerTile++;
-        } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::EngineClassCompute)) {
+        } else if (engine.engineClass == ioctlHelper->getDrmParamValue(DrmParam::engineClassCompute)) {
            tileToEngineToInstanceMap[tile][static_cast<aub_stream::EngineType>(aub_stream::ENGINE_CCS + computeEnginesPerTile)] = engine;
            computeEnginesPerTile++;
        }
--- a/shared/source/os_interface/linux/ioctl_helper.cpp
+++ b/shared/source/os_interface/linux/ioctl_helper.cpp
@@ -213,85 +213,85 @@ unsigned int IoctlHelper::getIoctlRequestValueBase(DrmIoctl ioctlRequest) const

 int IoctlHelper::getDrmParamValueBase(DrmParam drmParam) const {
    switch (drmParam) {
-    case DrmParam::ContextCreateExtSetparam:
+    case DrmParam::contextCreateExtSetparam:
        return I915_CONTEXT_CREATE_EXT_SETPARAM;
-    case DrmParam::ContextCreateFlagsUseExtensions:
+    case DrmParam::contextCreateFlagsUseExtensions:
        return I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS;
-    case DrmParam::ContextEnginesExtLoadBalance:
+    case DrmParam::contextEnginesExtLoadBalance:
        return I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE;
-    case DrmParam::ContextParamEngines:
+    case DrmParam::contextParamEngines:
        return I915_CONTEXT_PARAM_ENGINES;
-    case DrmParam::ContextParamGttSize:
+    case DrmParam::contextParamGttSize:
        return I915_CONTEXT_PARAM_GTT_SIZE;
-    case DrmParam::ContextParamPersistence:
+    case DrmParam::contextParamPersistence:
        return I915_CONTEXT_PARAM_PERSISTENCE;
-    case DrmParam::ContextParamPriority:
+    case DrmParam::contextParamPriority:
        return I915_CONTEXT_PARAM_PRIORITY;
-    case DrmParam::ContextParamRecoverable:
+    case DrmParam::contextParamRecoverable:
        return I915_CONTEXT_PARAM_RECOVERABLE;
-    case DrmParam::ContextParamSseu:
+    case DrmParam::contextParamSseu:
        return I915_CONTEXT_PARAM_SSEU;
-    case DrmParam::ContextParamVm:
+    case DrmParam::contextParamVm:
        return I915_CONTEXT_PARAM_VM;
-    case DrmParam::EngineClassRender:
+    case DrmParam::engineClassRender:
        return drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER;
-    case DrmParam::EngineClassCopy:
+    case DrmParam::engineClassCopy:
        return drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY;
-    case DrmParam::EngineClassVideo:
+    case DrmParam::engineClassVideo:
        return drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO;
-    case DrmParam::EngineClassVideoEnhance:
+    case DrmParam::engineClassVideoEnhance:
        return drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE;
-    case DrmParam::EngineClassInvalid:
+    case DrmParam::engineClassInvalid:
        return drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID;
-    case DrmParam::EngineClassInvalidNone:
+    case DrmParam::engineClassInvalidNone:
        return I915_ENGINE_CLASS_INVALID_NONE;
-    case DrmParam::ExecBlt:
+    case DrmParam::execBlt:
        return I915_EXEC_BLT;
-    case DrmParam::ExecDefault:
+    case DrmParam::execDefault:
        return I915_EXEC_DEFAULT;
-    case DrmParam::ExecNoReloc:
+    case DrmParam::execNoReloc:
        return I915_EXEC_NO_RELOC;
-    case DrmParam::ExecRender:
+    case DrmParam::execRender:
        return I915_EXEC_RENDER;
-    case DrmParam::MemoryClassDevice:
+    case DrmParam::memoryClassDevice:
        return drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE;
-    case DrmParam::MemoryClassSystem:
+    case DrmParam::memoryClassSystem:
        return drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM;
-    case DrmParam::MmapOffsetWb:
+    case DrmParam::mmapOffsetWb:
        return I915_MMAP_OFFSET_WB;
-    case DrmParam::MmapOffsetWc:
+    case DrmParam::mmapOffsetWc:
        return I915_MMAP_OFFSET_WC;
-    case DrmParam::ParamChipsetId:
+    case DrmParam::paramChipsetId:
        return I915_PARAM_CHIPSET_ID;
-    case DrmParam::ParamRevision:
+    case DrmParam::paramRevision:
        return I915_PARAM_REVISION;
-    case DrmParam::ParamHasExecSoftpin:
+    case DrmParam::paramHasExecSoftpin:
        return I915_PARAM_HAS_EXEC_SOFTPIN;
-    case DrmParam::ParamHasPooledEu:
+    case DrmParam::paramHasPooledEu:
        return I915_PARAM_HAS_POOLED_EU;
-    case DrmParam::ParamHasScheduler:
+    case DrmParam::paramHasScheduler:
        return I915_PARAM_HAS_SCHEDULER;
-    case DrmParam::ParamEuTotal:
+    case DrmParam::paramEuTotal:
        return I915_PARAM_EU_TOTAL;
-    case DrmParam::ParamSubsliceTotal:
+    case DrmParam::paramSubsliceTotal:
        return I915_PARAM_SUBSLICE_TOTAL;
-    case DrmParam::ParamMinEuInPool:
+    case DrmParam::paramMinEuInPool:
        return I915_PARAM_MIN_EU_IN_POOL;
-    case DrmParam::ParamCsTimestampFrequency:
+    case DrmParam::paramCsTimestampFrequency:
        return I915_PARAM_CS_TIMESTAMP_FREQUENCY;
-    case DrmParam::QueryEngineInfo:
+    case DrmParam::queryEngineInfo:
        return DRM_I915_QUERY_ENGINE_INFO;
-    case DrmParam::QueryMemoryRegions:
+    case DrmParam::queryMemoryRegions:
        return DRM_I915_QUERY_MEMORY_REGIONS;
-    case DrmParam::QueryTopologyInfo:
+    case DrmParam::queryTopologyInfo:
        return DRM_I915_QUERY_TOPOLOGY_INFO;
-    case DrmParam::SchedulerCapPreemption:
+    case DrmParam::schedulerCapPreemption:
        return I915_SCHEDULER_CAP_PREEMPTION;
-    case DrmParam::TilingNone:
+    case DrmParam::tilingNone:
        return I915_TILING_NONE;
-    case DrmParam::TilingY:
+    case DrmParam::tilingY:
        return I915_TILING_Y;
-    case DrmParam::ParamOATimestampFrequency:
+    case DrmParam::paramOATimestampFrequency:
        return I915_PARAM_OA_TIMESTAMP_FREQUENCY;
    default:
        UNRECOVERABLE_IF(true);
@@ -301,25 +301,25 @@ int IoctlHelper::getDrmParamValueBase(DrmParam drmParam) const {

 std::string IoctlHelper::getDrmParamStringBase(DrmParam drmParam) const {
    switch (drmParam) {
-    case DrmParam::ParamChipsetId:
+    case DrmParam::paramChipsetId:
        return "I915_PARAM_CHIPSET_ID";
-    case DrmParam::ParamRevision:
+    case DrmParam::paramRevision:
        return "I915_PARAM_REVISION";
-    case DrmParam::ParamHasExecSoftpin:
+    case DrmParam::paramHasExecSoftpin:
        return "I915_PARAM_HAS_EXEC_SOFTPIN";
-    case DrmParam::ParamHasPooledEu:
+    case DrmParam::paramHasPooledEu:
        return "I915_PARAM_HAS_POOLED_EU";
-    case DrmParam::ParamHasScheduler:
+    case DrmParam::paramHasScheduler:
        return "I915_PARAM_HAS_SCHEDULER";
-    case DrmParam::ParamEuTotal:
+    case DrmParam::paramEuTotal:
        return "I915_PARAM_EU_TOTAL";
-    case DrmParam::ParamSubsliceTotal:
+    case DrmParam::paramSubsliceTotal:
        return "I915_PARAM_SUBSLICE_TOTAL";
-    case DrmParam::ParamMinEuInPool:
+    case DrmParam::paramMinEuInPool:
        return "I915_PARAM_MIN_EU_IN_POOL";
-    case DrmParam::ParamCsTimestampFrequency:
+    case DrmParam::paramCsTimestampFrequency:
        return "I915_PARAM_CS_TIMESTAMP_FREQUENCY";
-    case DrmParam::ParamOATimestampFrequency:
+    case DrmParam::paramOATimestampFrequency:
        return "I915_PARAM_OA_TIMESTAMP_FREQUENCY";
    default:
        UNRECOVERABLE_IF(true);
@@ -394,7 +394,7 @@ bool IoctlHelper::checkIfIoctlReinvokeRequired(int error, DrmIoctl ioctlRequest)
 }

 std::unique_ptr<MemoryInfo> IoctlHelper::createMemoryInfo() {
-    auto request = getDrmParamValue(DrmParam::QueryMemoryRegions);
+    auto request = getDrmParamValue(DrmParam::queryMemoryRegions);
    auto dataQuery = drm.query<uint64_t>(request, 0);
    if (!dataQuery.empty()) {
        auto memRegions = translateToMemoryRegions(dataQuery);
@@ -405,7 +405,7 @@ std::unique_ptr<MemoryInfo> IoctlHelper::createMemoryInfo() {

 bool IoctlHelper::getTopologyDataAndMap(const HardwareInfo &hwInfo, DrmQueryTopologyData &topologyData, TopologyMap &topologyMap) {

-    auto request = this->getDrmParamValue(DrmParam::QueryTopologyInfo);
+    auto request = this->getDrmParamValue(DrmParam::queryTopologyInfo);
    auto dataQuery = drm.query<uint64_t>(request, 0);
    if (dataQuery.empty()) {
        return false;
@@ -490,7 +490,7 @@ bool IoctlHelper::translateTopologyInfo(const QueryTopologyInfo *queryTopologyIn
 }

 std::unique_ptr<EngineInfo> IoctlHelper::createEngineInfo(bool isSysmanEnabled) {
-    auto request = getDrmParamValue(DrmParam::QueryEngineInfo);
+    auto request = getDrmParamValue(DrmParam::queryEngineInfo);
    auto enginesQuery = drm.query<uint64_t>(request, 0);
    if (enginesQuery.empty()) {
        return {};
@@ -509,21 +509,21 @@ std::unique_ptr<EngineInfo> IoctlHelper::createEngineInfo(bool isSysmanEnabled)
    auto tileCount = 0u;
    std::vector<DistanceInfo> distanceInfos;
    for (const auto &region : memoryRegions) {
-        if (getDrmParamValue(DrmParam::MemoryClassDevice) == region.region.memoryClass) {
+        if (getDrmParamValue(DrmParam::memoryClassDevice) == region.region.memoryClass) {
            tileCount++;
            DistanceInfo distanceInfo{};
            distanceInfo.region = region.region;

            for (const auto &engine : engines) {
-                if (engine.engine.engineClass == getDrmParamValue(DrmParam::EngineClassCompute) ||
-                    engine.engine.engineClass == getDrmParamValue(DrmParam::EngineClassRender) ||
-                    engine.engine.engineClass == getDrmParamValue(DrmParam::EngineClassCopy)) {
+                if (engine.engine.engineClass == getDrmParamValue(DrmParam::engineClassCompute) ||
+                    engine.engine.engineClass == getDrmParamValue(DrmParam::engineClassRender) ||
+                    engine.engine.engineClass == getDrmParamValue(DrmParam::engineClassCopy)) {
                    distanceInfo.engine = engine.engine;
                    distanceInfos.push_back(distanceInfo);
                } else if (isSysmanEnabled) {

-                    if (engine.engine.engineClass == getDrmParamValue(DrmParam::EngineClassVideo) ||
-                        engine.engine.engineClass == getDrmParamValue(DrmParam::EngineClassVideoEnhance)) {
+                    if (engine.engine.engineClass == getDrmParamValue(DrmParam::engineClassVideo) ||
+                        engine.engine.engineClass == getDrmParamValue(DrmParam::engineClassVideoEnhance)) {
                        distanceInfo.engine = engine.engine;
                        distanceInfos.push_back(distanceInfo);
                    }
--- a/shared/source/os_interface/linux/ioctl_helper_prelim.cpp
+++ b/shared/source/os_interface/linux/ioctl_helper_prelim.cpp
@@ -74,7 +74,7 @@ bool IoctlHelperPrelim20::isChunkingAvailable() {

 bool IoctlHelperPrelim20::getTopologyDataAndMap(const HardwareInfo &hwInfo, DrmQueryTopologyData &topologyData, TopologyMap &topologyMap) {

-    auto request = this->getDrmParamValue(DrmParam::QueryComputeSlices);
+    auto request = this->getDrmParamValue(DrmParam::queryComputeSlices);
    auto engineInfo = drm.getEngineInfo();
    auto nTiles = hwInfo.gtSystemInfo.MultiTileArchInfo.TileCount;

@@ -343,12 +343,12 @@ std::optional<MemoryClassInstance> IoctlHelperPrelim20::getPreferredLocationRegi
        region.memoryInstance = 0;
        break;
    case PreferredLocation::system:
-        region.memoryClass = getDrmParamValue(DrmParam::MemoryClassSystem);
+        region.memoryClass = getDrmParamValue(DrmParam::memoryClassSystem);
        region.memoryInstance = 0;
        break;
    case PreferredLocation::device:
    default:
-        region.memoryClass = getDrmParamValue(DrmParam::MemoryClassDevice);
+        region.memoryClass = getDrmParamValue(DrmParam::memoryClassDevice);
        region.memoryInstance = memoryInstance;
        break;
    case PreferredLocation::none:
@@ -518,7 +518,7 @@ int IoctlHelperPrelim20::queryDistances(std::vector<QueryItem> &queryItems, std:
 }

 std::optional<DrmParam> IoctlHelperPrelim20::getHasPageFaultParamId() {
-    return DrmParam::ParamHasPageFault;
+    return DrmParam::paramHasPageFault;
 };

 bool IoctlHelperPrelim20::getEuStallProperties(std::array<uint64_t, 12u> &properties, uint64_t dssBufferSize, uint64_t samplingRate,
@@ -773,15 +773,15 @@ unsigned int IoctlHelperPrelim20::getIoctlRequestValue(DrmIoctl ioctlRequest) co

 int IoctlHelperPrelim20::getDrmParamValue(DrmParam drmParam) const {
    switch (drmParam) {
-    case DrmParam::EngineClassCompute:
+    case DrmParam::engineClassCompute:
        return prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE;
-    case DrmParam::ParamHasVmBind:
+    case DrmParam::paramHasVmBind:
        return PRELIM_I915_PARAM_HAS_VM_BIND;
-    case DrmParam::ParamHasPageFault:
+    case DrmParam::paramHasPageFault:
        return PRELIM_I915_PARAM_HAS_PAGE_FAULT;
-    case DrmParam::QueryHwconfigTable:
+    case DrmParam::queryHwconfigTable:
        return PRELIM_DRM_I915_QUERY_HWCONFIG_TABLE;
-    case DrmParam::QueryComputeSlices:
+    case DrmParam::queryComputeSlices:
        return PRELIM_DRM_I915_QUERY_COMPUTE_SUBSLICES;
    default:
        return getDrmParamValueBase(drmParam);
@@ -789,9 +789,9 @@ int IoctlHelperPrelim20::getDrmParamValue(DrmParam drmParam) const {
 }
 std::string IoctlHelperPrelim20::getDrmParamString(DrmParam drmParam) const {
    switch (drmParam) {
-    case DrmParam::ParamHasVmBind:
+    case DrmParam::paramHasVmBind:
        return "PRELIM_I915_PARAM_HAS_VM_BIND";
-    case DrmParam::ParamHasPageFault:
+    case DrmParam::paramHasPageFault:
        return "PRELIM_I915_PARAM_HAS_PAGE_FAULT";
    default:
        return getDrmParamStringBase(drmParam);
@@ -929,7 +929,7 @@ void IoctlHelperPrelim20::setupIpVersion() {
    auto hwInfo = rootDeviceEnvironment.getMutableHardwareInfo();
    auto &productHelper = drm.getRootDeviceEnvironment().getHelper<ProductHelper>();

-    EngineClassInstance engineInfo = {static_cast<uint16_t>(getDrmParamValue(DrmParam::EngineClassRender)), 0};
+    EngineClassInstance engineInfo = {static_cast<uint16_t>(getDrmParamValue(DrmParam::engineClassRender)), 0};
    int ret = 0;

    auto isPlatformQuerySupported = productHelper.isPlatformQuerySupported();
--- a/shared/source/os_interface/linux/ioctl_helper_upstream.cpp
+++ b/shared/source/os_interface/linux/ioctl_helper_upstream.cpp
@@ -280,11 +280,11 @@ unsigned int IoctlHelperUpstream::getIoctlRequestValue(DrmIoctl ioctlRequest) co

 int IoctlHelperUpstream::getDrmParamValue(DrmParam drmParam) const {
    switch (drmParam) {
-    case DrmParam::EngineClassCompute:
+    case DrmParam::engineClassCompute:
        return 4;
-    case DrmParam::QueryHwconfigTable:
+    case DrmParam::queryHwconfigTable:
        return DRM_I915_QUERY_HWCONFIG_BLOB;
-    case DrmParam::QueryComputeSlices:
+    case DrmParam::queryComputeSlices:
        return 0;
    default:
        return getDrmParamValueBase(drmParam);
--- a/shared/source/os_interface/linux/memory_info.cpp
+++ b/shared/source/os_interface/linux/memory_info.cpp
@@ -22,8 +22,8 @@ namespace NEO {
 MemoryInfo::MemoryInfo(const RegionContainer &regionInfo, const Drm &inputDrm)
    : drm(inputDrm), drmQueryRegions(regionInfo), systemMemoryRegion(drmQueryRegions[0]) {
    auto ioctlHelper = drm.getIoctlHelper();
-    const auto memoryClassSystem = ioctlHelper->getDrmParamValue(DrmParam::MemoryClassSystem);
-    const auto memoryClassDevice = ioctlHelper->getDrmParamValue(DrmParam::MemoryClassDevice);
+    const auto memoryClassSystem = ioctlHelper->getDrmParamValue(DrmParam::memoryClassSystem);
+    const auto memoryClassDevice = ioctlHelper->getDrmParamValue(DrmParam::memoryClassDevice);
    UNRECOVERABLE_IF(this->systemMemoryRegion.region.memoryClass != memoryClassSystem);
    std::copy_if(drmQueryRegions.begin(), drmQueryRegions.end(), std::back_inserter(localMemoryRegions),
                 [&](const MemoryRegion &memoryRegionInfo) {
--- a/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp
+++ b/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp
@@ -48,7 +48,7 @@ int IoctlHelperXe::xeGetQuery(Query *data) {
        QueryItem *queryItem = reinterpret_cast<QueryItem *>(data->itemsPtr);
        std::vector<uint32_t> *queryData = nullptr;
        switch (queryItem->queryId) {
-        case static_cast<int>(DrmParam::QueryHwconfigTable):
+        case static_cast<int>(DrmParam::queryHwconfigTable):
            queryData = &hwconfigFakei915;
            break;
        default:
@@ -242,11 +242,11 @@ std::unique_ptr<EngineInfo> IoctlHelperXe::createEngineInfo(bool isSysmanEnabled
        engineClassInstance.engineInstance = queriedEngines[i].engine_instance;
        xeLog("\t%s:%d\n", xeGetClassName(engineClassInstance.engineClass), engineClassInstance.engineInstance);

-        if (engineClassInstance.engineClass == getDrmParamValue(DrmParam::EngineClassCompute) ||
-            engineClassInstance.engineClass == getDrmParamValue(DrmParam::EngineClassRender) ||
-            engineClassInstance.engineClass == getDrmParamValue(DrmParam::EngineClassCopy) ||
-            (isSysmanEnabled && (engineClassInstance.engineClass == getDrmParamValue(DrmParam::EngineClassVideo) ||
-                                 engineClassInstance.engineClass == getDrmParamValue(DrmParam::EngineClassVideoEnhance)))) {
+        if (engineClassInstance.engineClass == getDrmParamValue(DrmParam::engineClassCompute) ||
+            engineClassInstance.engineClass == getDrmParamValue(DrmParam::engineClassRender) ||
+            engineClassInstance.engineClass == getDrmParamValue(DrmParam::engineClassCopy) ||
+            (isSysmanEnabled && (engineClassInstance.engineClass == getDrmParamValue(DrmParam::engineClassVideo) ||
+                                 engineClassInstance.engineClass == getDrmParamValue(DrmParam::engineClassVideoEnhance)))) {

            if (enginesPerTile.size() <= tile) {
                enginesPerTile.resize(tile + 1);
@@ -893,21 +893,21 @@ int IoctlHelperXe::getDrmParamValue(DrmParam drmParam) const {
    xeLog(" -> IoctlHelperXe::%s 0x%x %s\n", __FUNCTION__, drmParam, getDrmParamString(drmParam).c_str());

    switch (drmParam) {
-    case DrmParam::MemoryClassDevice:
+    case DrmParam::memoryClassDevice:
        return DRM_XE_MEM_REGION_CLASS_VRAM;
-    case DrmParam::MemoryClassSystem:
+    case DrmParam::memoryClassSystem:
        return DRM_XE_MEM_REGION_CLASS_SYSMEM;
-    case DrmParam::EngineClassRender:
+    case DrmParam::engineClassRender:
        return DRM_XE_ENGINE_CLASS_RENDER;
-    case DrmParam::EngineClassCopy:
+    case DrmParam::engineClassCopy:
        return DRM_XE_ENGINE_CLASS_COPY;
-    case DrmParam::EngineClassVideo:
+    case DrmParam::engineClassVideo:
        return DRM_XE_ENGINE_CLASS_VIDEO_DECODE;
-    case DrmParam::EngineClassVideoEnhance:
+    case DrmParam::engineClassVideoEnhance:
        return DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE;
-    case DrmParam::EngineClassCompute:
+    case DrmParam::engineClassCompute:
        return DRM_XE_ENGINE_CLASS_COMPUTE;
-    case DrmParam::EngineClassInvalid:
+    case DrmParam::engineClassInvalid:
        return -1;

    default:
@@ -927,22 +927,22 @@ int IoctlHelperXe::ioctl(DrmIoctl request, void *arg) {
        struct GetParam *d = (struct GetParam *)arg;
        ret = 0;
        switch (d->param) {
-        case static_cast<int>(DrmParam::ParamChipsetId):
+        case static_cast<int>(DrmParam::paramChipsetId):
            *d->value = chipsetId;
            break;
-        case static_cast<int>(DrmParam::ParamRevision):
+        case static_cast<int>(DrmParam::paramRevision):
            *d->value = revId;
            break;
-        case static_cast<int>(DrmParam::ParamHasPageFault):
+        case static_cast<int>(DrmParam::paramHasPageFault):
            *d->value = 0;
            break;
-        case static_cast<int>(DrmParam::ParamHasExecSoftpin):
+        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);
            break;
-        case static_cast<int>(DrmParam::ParamCsTimestampFrequency): {
+        case static_cast<int>(DrmParam::paramCsTimestampFrequency): {
            uint64_t frequency = 0;
            if (getTimestampFrequency(frequency)) {
                *d->value = static_cast<int>(frequency);
@@ -996,13 +996,13 @@ int IoctlHelperXe::ioctl(DrmIoctl request, void *arg) {
        auto addressSpace = drm.getRootDeviceEnvironment().getHardwareInfo()->capabilityTable.gpuAddressSpace;
        ret = 0;
        switch (d->param) {
-        case static_cast<int>(DrmParam::ContextParamGttSize):
+        case static_cast<int>(DrmParam::contextParamGttSize):
            d->value = addressSpace + 1u;
            break;
-        case static_cast<int>(DrmParam::ContextParamSseu):
+        case static_cast<int>(DrmParam::contextParamSseu):
            d->value = 0x55fdd94d4e40;
            break;
-        case static_cast<int>(DrmParam::ContextParamPersistence):
+        case static_cast<int>(DrmParam::contextParamPersistence):
            d->value = 0x1;
            break;
        default:
@@ -1014,11 +1014,11 @@ int IoctlHelperXe::ioctl(DrmIoctl request, void *arg) {
    case DrmIoctl::gemContextSetparam: {
        GemContextParam *d = static_cast<GemContextParam *>(arg);
        switch (d->param) {
-        case static_cast<int>(DrmParam::ContextParamPersistence):
+        case static_cast<int>(DrmParam::contextParamPersistence):
            if (d->value == 0)
                ret = 0;
            break;
-        case static_cast<int>(DrmParam::ContextParamEngines): {
+        case static_cast<int>(DrmParam::contextParamEngines): {
            i915_context_param_engines *contextEngine = reinterpret_cast<i915_context_param_engines *>(d->value);
            int items = (d->size - sizeof(uint64_t)) / sizeof(uint32_t);
            contextParamEngine.clear();
@@ -1165,13 +1165,13 @@ int IoctlHelperXe::createDrmContext(Drm &drm, OsContextLinux &osContext, uint32_
    xeLog("createDrmContext VM=0x%x\n", drmVmId);
    auto engineFlag = drm.bindDrmContext(drmContextId, deviceIndex, osContext.getEngineType(), osContext.isEngineInstanced());
    switch (engineFlag) {
-    case static_cast<int>(DrmParam::ExecRender):
+    case static_cast<int>(DrmParam::execRender):
        requestClass = DRM_XE_ENGINE_CLASS_RENDER;
        break;
-    case static_cast<int>(DrmParam::ExecBlt):
+    case static_cast<int>(DrmParam::execBlt):
        requestClass = DRM_XE_ENGINE_CLASS_COPY;
        break;
-    case static_cast<int>(DrmParam::ExecDefault):
+    case static_cast<int>(DrmParam::execDefault):
        requestClass = DRM_XE_ENGINE_CLASS_COMPUTE;
        break;
    default:
@@ -1320,93 +1320,93 @@ int IoctlHelperXe::xeVmBind(const VmBindParams &vmBindParams, bool isBind) {

 std::string IoctlHelperXe::getDrmParamString(DrmParam drmParam) const {
    switch (drmParam) {
-    case DrmParam::ContextCreateExtSetparam:
+    case DrmParam::contextCreateExtSetparam:
        return "ContextCreateExtSetparam";
-    case DrmParam::ContextCreateFlagsUseExtensions:
+    case DrmParam::contextCreateFlagsUseExtensions:
        return "ContextCreateFlagsUseExtensions";
-    case DrmParam::ContextEnginesExtLoadBalance:
+    case DrmParam::contextEnginesExtLoadBalance:
        return "ContextEnginesExtLoadBalance";
-    case DrmParam::ContextParamEngines:
+    case DrmParam::contextParamEngines:
        return "ContextParamEngines";
-    case DrmParam::ContextParamGttSize:
+    case DrmParam::contextParamGttSize:
        return "ContextParamGttSize";
-    case DrmParam::ContextParamPersistence:
+    case DrmParam::contextParamPersistence:
        return "ContextParamPersistence";
-    case DrmParam::ContextParamPriority:
+    case DrmParam::contextParamPriority:
        return "ContextParamPriority";
-    case DrmParam::ContextParamRecoverable:
+    case DrmParam::contextParamRecoverable:
        return "ContextParamRecoverable";
-    case DrmParam::ContextParamSseu:
+    case DrmParam::contextParamSseu:
        return "ContextParamSseu";
-    case DrmParam::ContextParamVm:
+    case DrmParam::contextParamVm:
        return "ContextParamVm";
-    case DrmParam::EngineClassRender:
+    case DrmParam::engineClassRender:
        return "EngineClassRender";
-    case DrmParam::EngineClassCompute:
+    case DrmParam::engineClassCompute:
        return "EngineClassCompute";
-    case DrmParam::EngineClassCopy:
+    case DrmParam::engineClassCopy:
        return "EngineClassCopy";
-    case DrmParam::EngineClassVideo:
+    case DrmParam::engineClassVideo:
        return "EngineClassVideo";
-    case DrmParam::EngineClassVideoEnhance:
+    case DrmParam::engineClassVideoEnhance:
        return "EngineClassVideoEnhance";
-    case DrmParam::EngineClassInvalid:
+    case DrmParam::engineClassInvalid:
        return "EngineClassInvalid";
-    case DrmParam::EngineClassInvalidNone:
+    case DrmParam::engineClassInvalidNone:
        return "EngineClassInvalidNone";
-    case DrmParam::ExecBlt:
+    case DrmParam::execBlt:
        return "ExecBlt";
-    case DrmParam::ExecDefault:
+    case DrmParam::execDefault:
        return "ExecDefault";
-    case DrmParam::ExecNoReloc:
+    case DrmParam::execNoReloc:
        return "ExecNoReloc";
-    case DrmParam::ExecRender:
+    case DrmParam::execRender:
        return "ExecRender";
-    case DrmParam::MemoryClassDevice:
+    case DrmParam::memoryClassDevice:
        return "MemoryClassDevice";
-    case DrmParam::MemoryClassSystem:
+    case DrmParam::memoryClassSystem:
        return "MemoryClassSystem";
-    case DrmParam::MmapOffsetWb:
+    case DrmParam::mmapOffsetWb:
        return "MmapOffsetWb";
-    case DrmParam::MmapOffsetWc:
+    case DrmParam::mmapOffsetWc:
        return "MmapOffsetWc";
-    case DrmParam::ParamChipsetId:
+    case DrmParam::paramChipsetId:
        return "ParamChipsetId";
-    case DrmParam::ParamRevision:
+    case DrmParam::paramRevision:
        return "ParamRevision";
-    case DrmParam::ParamHasExecSoftpin:
+    case DrmParam::paramHasExecSoftpin:
        return "ParamHasExecSoftpin";
-    case DrmParam::ParamHasPooledEu:
+    case DrmParam::paramHasPooledEu:
        return "ParamHasPooledEu";
-    case DrmParam::ParamHasScheduler:
+    case DrmParam::paramHasScheduler:
        return "ParamHasScheduler";
-    case DrmParam::ParamEuTotal:
+    case DrmParam::paramEuTotal:
        return "ParamEuTotal";
-    case DrmParam::ParamSubsliceTotal:
+    case DrmParam::paramSubsliceTotal:
        return "ParamSubsliceTotal";
-    case DrmParam::ParamMinEuInPool:
+    case DrmParam::paramMinEuInPool:
        return "ParamMinEuInPool";
-    case DrmParam::ParamCsTimestampFrequency:
+    case DrmParam::paramCsTimestampFrequency:
        return "ParamCsTimestampFrequency";
-    case DrmParam::ParamHasVmBind:
+    case DrmParam::paramHasVmBind:
        return "ParamHasVmBind";
-    case DrmParam::ParamHasPageFault:
+    case DrmParam::paramHasPageFault:
        return "ParamHasPageFault";
-    case DrmParam::QueryEngineInfo:
+    case DrmParam::queryEngineInfo:
        return "QueryEngineInfo";
-    case DrmParam::QueryHwconfigTable:
+    case DrmParam::queryHwconfigTable:
        return "QueryHwconfigTable";
-    case DrmParam::QueryComputeSlices:
+    case DrmParam::queryComputeSlices:
        return "QueryComputeSlices";
-    case DrmParam::QueryMemoryRegions:
+    case DrmParam::queryMemoryRegions:
        return "QueryMemoryRegions";
-    case DrmParam::QueryTopologyInfo:
+    case DrmParam::queryTopologyInfo:
        return "QueryTopologyInfo";
-    case DrmParam::SchedulerCapPreemption:
+    case DrmParam::schedulerCapPreemption:
        return "SchedulerCapPreemption";
-    case DrmParam::TilingNone:
+    case DrmParam::tilingNone:
        return "TilingNone";
-    case DrmParam::TilingY:
+    case DrmParam::tilingY:
        return "TilingY";
    default:
        return "DrmParam::<missing>";
--- a/shared/test/common/libult/linux/drm_mock_engine.cpp
+++ b/shared/test/common/libult/linux/drm_mock_engine.cpp
@@ -18,7 +18,7 @@ DrmMockEngine::DrmMockEngine(RootDeviceEnvironment &rootDeviceEnvironment) : Drm
 }

 void DrmMockEngine::handleQueryItem(QueryItem *queryItem) {
-    if (queryItem->queryId == static_cast<uint64_t>(ioctlHelper->getDrmParamValue(DrmParam::QueryEngineInfo))) {
+    if (queryItem->queryId == static_cast<uint64_t>(ioctlHelper->getDrmParamValue(DrmParam::queryEngineInfo))) {
        if (queryEngineInfoSuccessCount == 0) {
            queryItem->length = -EINVAL;
        } else {
@@ -32,13 +32,13 @@ void DrmMockEngine::handleQueryItem(QueryItem *queryItem) {
                auto queryEnginenInfo = reinterpret_cast<drm_i915_query_engine_info *>(queryItem->dataPtr);
                EXPECT_EQ(0u, queryEnginenInfo->num_engines);
                queryEnginenInfo->num_engines = numberOfEngines;
-                queryEnginenInfo->engines[0].engine.engine_class = static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender));
+                queryEnginenInfo->engines[0].engine.engine_class = static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender));
                queryEnginenInfo->engines[0].engine.engine_instance = 1;
-                queryEnginenInfo->engines[1].engine.engine_class = static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy));
+                queryEnginenInfo->engines[1].engine.engine_class = static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy));
                queryEnginenInfo->engines[1].engine.engine_instance = 1;
            }
        }
-    } else if (queryItem->queryId == static_cast<uint64_t>(ioctlHelper->getDrmParamValue(DrmParam::QueryHwconfigTable))) {
+    } else if (queryItem->queryId == static_cast<uint64_t>(ioctlHelper->getDrmParamValue(DrmParam::queryHwconfigTable))) {
        if (failQueryDeviceBlob) {
            queryItem->length = -EINVAL;
        } else {
--- a/shared/test/common/mocks/linux/mock_ioctl_helper.h
+++ b/shared/test/common/mocks/linux/mock_ioctl_helper.h
@@ -33,7 +33,7 @@ class MockIoctlHelper : public IoctlHelperPrelim20 {
    };

    int getDrmParamValue(DrmParam drmParam) const override {
-        if (drmParam == DrmParam::MemoryClassSystem || drmParam == DrmParam::MemoryClassDevice) {
+        if (drmParam == DrmParam::memoryClassSystem || drmParam == DrmParam::memoryClassDevice) {
            return IoctlHelperPrelim20::getDrmParamValue(drmParam);
        }
        return drmParamValue;
--- a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp
@@ -58,14 +58,14 @@ TEST_F(DrmBufferObjectTest, GivenDetectedGpuHangDuringEvictUnusedAllocationsWhen

 TEST_F(DrmBufferObjectTest, WhenSettingTilingThenCallSucceeds) {
    mock->ioctlExpected.total = 1; // set_tiling
-    auto tilingY = mock->getIoctlHelper()->getDrmParamValue(DrmParam::TilingY);
+    auto tilingY = mock->getIoctlHelper()->getDrmParamValue(DrmParam::tilingY);
    auto ret = bo->setTiling(tilingY, 0);
    EXPECT_TRUE(ret);
 }

 TEST_F(DrmBufferObjectTest, WhenSettingSameTilingThenCallSucceeds) {
    mock->ioctlExpected.total = 0; // set_tiling
-    auto tilingY = mock->getIoctlHelper()->getDrmParamValue(DrmParam::TilingY);
+    auto tilingY = mock->getIoctlHelper()->getDrmParamValue(DrmParam::tilingY);
    bo->tilingMode = tilingY;
    auto ret = bo->setTiling(tilingY, 0);
    EXPECT_TRUE(ret);
@@ -73,7 +73,7 @@ TEST_F(DrmBufferObjectTest, WhenSettingSameTilingThenCallSucceeds) {

 TEST_F(DrmBufferObjectTest, GivenInvalidTilingWhenSettingTilingThenCallFails) {
    mock->ioctlExpected.total = 1; // set_tiling
-    auto tilingY = mock->getIoctlHelper()->getDrmParamValue(DrmParam::TilingY);
+    auto tilingY = mock->getIoctlHelper()->getDrmParamValue(DrmParam::tilingY);
    mock->ioctlRes = -1;
    auto ret = bo->setTiling(tilingY, 0);
    EXPECT_FALSE(ret);
--- a/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp
@@ -59,9 +59,9 @@ TEST(EngineInfoTest, whenCreateEngineInfoWithRcsThenCorrectHwInfoSet) {

    auto &hwInfo = *drm->getRootDeviceEnvironment().getHardwareInfo();
    std::vector<EngineCapabilities> engines(2);
-    engines[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 0};
+    engines[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 0};
    engines[0].capabilities = 0;
-    engines[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 0};
+    engines[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)), 0};
    engines[1].capabilities = 0;
    auto engineInfo = std::make_unique<EngineInfo>(drm.get(), engines);

@@ -78,7 +78,7 @@ TEST(EngineInfoTest, whenCallingGetEngineTileInfoCorrectValuesAreReturned) {
    auto ioctlHelper = drm->getIoctlHelper();

    std::vector<EngineCapabilities> engines(1);
-    engines[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 0};
+    engines[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 0};
    engines[0].capabilities = 0;
    auto engineInfo = std::make_unique<EngineInfo>(drm.get(), engines);

@@ -95,10 +95,10 @@ TEST(EngineInfoTest, whenCreateEngineInfoWithCcsThenCorrectHwInfoSet) {

    auto &hwInfo = *drm->getRootDeviceEnvironment().getHardwareInfo();
    std::vector<EngineCapabilities> engines(2);
-    uint16_t ccsClass = ioctlHelper->getDrmParamValue(DrmParam::EngineClassCompute);
+    uint16_t ccsClass = ioctlHelper->getDrmParamValue(DrmParam::engineClassCompute);
    engines[0].engine = {ccsClass, 0};
    engines[0].capabilities = 0;
-    engines[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 0};
+    engines[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)), 0};
    engines[1].capabilities = 0;
    auto engineInfo = std::make_unique<EngineInfo>(drm.get(), engines);

@@ -115,13 +115,13 @@ TEST(EngineInfoTest, whenGetEngineInstanceAndTileThenCorrectValuesReturned) {
    auto ioctlHelper = drm->getIoctlHelper();

    std::vector<EngineCapabilities> engines(4);
-    engines[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 0};
+    engines[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 0};
    engines[0].capabilities = 0;
-    engines[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 0};
+    engines[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)), 0};
    engines[1].capabilities = 0;
-    engines[2].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 1};
+    engines[2].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 1};
    engines[2].capabilities = 0;
-    engines[3].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 1};
+    engines[3].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)), 1};
    engines[3].capabilities = 0;

    std::vector<DistanceInfo> distances(4);
@@ -155,7 +155,7 @@ TEST(EngineInfoTest, whenGetEngineInstanceAndTileThenCorrectValuesReturned) {
    EXPECT_EQ(0u, engineInfo->getEngineTileIndex(engines[0].engine));
    EXPECT_EQ(1u, engineInfo->getEngineTileIndex(engines[2].engine));

-    EXPECT_EQ(0u, engineInfo->getEngineTileIndex({static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 2}));
+    EXPECT_EQ(0u, engineInfo->getEngineTileIndex({static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 2}));
 }

 TEST(EngineInfoTest, whenCreateEngineInfoAndInvalidQueryThenNoEnginesSet) {
@@ -164,13 +164,13 @@ TEST(EngineInfoTest, whenCreateEngineInfoAndInvalidQueryThenNoEnginesSet) {
    auto ioctlHelper = drm->getIoctlHelper();

    std::vector<EngineCapabilities> engines(4);
-    engines[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 0};
+    engines[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 0};
    engines[0].capabilities = 0;
-    engines[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 0};
+    engines[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)), 0};
    engines[1].capabilities = 0;
-    engines[2].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 1};
+    engines[2].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 1};
    engines[2].capabilities = 0;
-    engines[3].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 1};
+    engines[3].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)), 1};
    engines[3].capabilities = 0;

    std::vector<DistanceInfo> distances(4);
@@ -201,5 +201,5 @@ TEST(EngineInfoTest, whenEmptyEngineInfoCreatedThen0TileReturned) {
    std::vector<QueryItem> queryItems;

    auto engineInfo = std::make_unique<EngineInfo>(drm.get(), 0, distances, queryItems, engines);
-    EXPECT_EQ(0u, engineInfo->getEngineTileIndex({static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 1}));
+    EXPECT_EQ(0u, engineInfo->getEngineTileIndex({static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 1}));
 }
--- a/shared/test/unit_test/os_interface/linux/drm_mapper_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_mapper_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -20,10 +20,10 @@ TEST(DrmMapperTests, GivenEngineWhenMappingNodeThenCorrectEngineReturned) {
    auto flagRcs = DrmEngineMapper::engineNodeMap(aub_stream::ENGINE_RCS);
    auto flagCcs = DrmEngineMapper::engineNodeMap(aub_stream::ENGINE_CCS);
    auto flagCccs = DrmEngineMapper::engineNodeMap(aub_stream::ENGINE_CCCS);
-    auto expectedBcs = DrmParam::ExecBlt;
-    auto expectedRcs = DrmParam::ExecRender;
-    auto expectedCcs = DrmParam::ExecDefault;
-    auto expectedCccs = DrmParam::ExecRender;
+    auto expectedBcs = DrmParam::execBlt;
+    auto expectedRcs = DrmParam::execRender;
+    auto expectedCcs = DrmParam::execDefault;
+    auto expectedCccs = DrmParam::execRender;
    EXPECT_EQ(expectedBcs, flagBcs);
    EXPECT_EQ(expectedRcs, flagRcs);
    EXPECT_EQ(expectedCcs, flagCcs);
@@ -36,12 +36,12 @@ TEST(DrmMapperTests, givenLinkCopyEngineWhenMapperCalledThenReturnDefaultBltEngi
                                                                   aub_stream::ENGINE_BCS7, aub_stream::ENGINE_BCS8}};

    for (auto engine : bcsLinkEngines) {
-        EXPECT_EQ(DrmParam::ExecBlt, DrmEngineMapper::engineNodeMap(engine));
+        EXPECT_EQ(DrmParam::execBlt, DrmEngineMapper::engineNodeMap(engine));
    }
 }

 TEST(DrmMapperTests, GivenCcsWhenGettingEngineNodeMapThenReturnDefault) {
-    auto expected = DrmParam::ExecDefault;
+    auto expected = DrmParam::execDefault;
    EXPECT_EQ(DrmEngineMapper::engineNodeMap(aub_stream::ENGINE_CCS), expected);
    EXPECT_EQ(DrmEngineMapper::engineNodeMap(aub_stream::ENGINE_CCS1), expected);
    EXPECT_EQ(DrmEngineMapper::engineNodeMap(aub_stream::ENGINE_CCS2), expected);
--- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
@@ -1991,7 +1991,7 @@ TEST_F(DrmMemoryManagerTest, GivenMemoryManagerWhenAllocateGraphicsMemoryForImag
    EXPECT_EQ(1u, this->mock->createParamsHandle);
    EXPECT_EQ(imgInfo.size, this->mock->createParamsSize);
    auto ioctlHelper = this->mock->getIoctlHelper();
-    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::TilingY);
+    uint32_t tilingMode = ioctlHelper->getDrmParamValue(DrmParam::tilingY);
    EXPECT_EQ(tilingMode, this->mock->setTilingMode);
    EXPECT_EQ(imgInfo.rowPitch, this->mock->setTilingStride);
    EXPECT_EQ(1u, this->mock->setTilingHandle);
--- a/shared/test/unit_test/os_interface/linux/drm_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_tests.cpp
@@ -1468,11 +1468,11 @@ TEST(DrmWrapperTest, WhenGettingDrmIoctlVersionValueThenIoctlHelperIsNotNeeded)
 }

 TEST(DrmWrapperTest, WhenGettingChipsetIdParamValueThenIoctlHelperIsNotNeeded) {
-    EXPECT_EQ(getDrmParamValue(DrmParam::ParamChipsetId, nullptr), static_cast<int>(I915_PARAM_CHIPSET_ID));
+    EXPECT_EQ(getDrmParamValue(DrmParam::paramChipsetId, nullptr), static_cast<int>(I915_PARAM_CHIPSET_ID));
 }

 TEST(DrmWrapperTest, WhenGettingRevisionParamValueThenIoctlHelperIsNotNeeded) {
-    EXPECT_EQ(getDrmParamValue(DrmParam::ParamRevision, nullptr), static_cast<int>(I915_PARAM_REVISION));
+    EXPECT_EQ(getDrmParamValue(DrmParam::paramRevision, nullptr), static_cast<int>(I915_PARAM_REVISION));
 }

 TEST(DrmWrapperTest, whenGettingDrmParamOrIoctlRequestValueThenUseIoctlHelperWhenAvailable) {
@@ -1483,8 +1483,8 @@ TEST(DrmWrapperTest, whenGettingDrmParamOrIoctlRequestValueThenUseIoctlHelperWhe
    EXPECT_EQ(getIoctlRequestValue(DrmIoctl::getparam, &ioctlHelper), ioctlHelper.ioctlRequestValue);
    EXPECT_NE(getIoctlRequestValue(DrmIoctl::getparam, nullptr), getIoctlRequestValue(DrmIoctl::getparam, &ioctlHelper));

-    EXPECT_EQ(getDrmParamValue(DrmParam::ParamChipsetId, &ioctlHelper), ioctlHelper.drmParamValue);
-    EXPECT_NE(getDrmParamValue(DrmParam::ParamChipsetId, nullptr), getDrmParamValue(DrmParam::ParamChipsetId, &ioctlHelper));
+    EXPECT_EQ(getDrmParamValue(DrmParam::paramChipsetId, &ioctlHelper), ioctlHelper.drmParamValue);
+    EXPECT_NE(getDrmParamValue(DrmParam::paramChipsetId, nullptr), getDrmParamValue(DrmParam::paramChipsetId, &ioctlHelper));
 }

 TEST(DrmWrapperTest, WhenGettingIoctlStringValueThenProperStringIsReturned) {
@@ -1501,24 +1501,24 @@ TEST(DrmWrapperTest, WhenGettingDrmParamValueStringThenProperStringIsReturned) {

    MockIoctlHelper ioctlHelper{drm};
    std::map<DrmParam, const char *> ioctlCodeStringMap = {
-        {DrmParam::ParamHasExecSoftpin, "I915_PARAM_HAS_EXEC_SOFTPIN"},
-        {DrmParam::ParamHasPooledEu, "I915_PARAM_HAS_POOLED_EU"},
-        {DrmParam::ParamHasScheduler, "I915_PARAM_HAS_SCHEDULER"},
-        {DrmParam::ParamEuTotal, "I915_PARAM_EU_TOTAL"},
-        {DrmParam::ParamSubsliceTotal, "I915_PARAM_SUBSLICE_TOTAL"},
-        {DrmParam::ParamMinEuInPool, "I915_PARAM_MIN_EU_IN_POOL"},
-        {DrmParam::ParamCsTimestampFrequency, "I915_PARAM_CS_TIMESTAMP_FREQUENCY"}};
+        {DrmParam::paramHasExecSoftpin, "I915_PARAM_HAS_EXEC_SOFTPIN"},
+        {DrmParam::paramHasPooledEu, "I915_PARAM_HAS_POOLED_EU"},
+        {DrmParam::paramHasScheduler, "I915_PARAM_HAS_SCHEDULER"},
+        {DrmParam::paramEuTotal, "I915_PARAM_EU_TOTAL"},
+        {DrmParam::paramSubsliceTotal, "I915_PARAM_SUBSLICE_TOTAL"},
+        {DrmParam::paramMinEuInPool, "I915_PARAM_MIN_EU_IN_POOL"},
+        {DrmParam::paramCsTimestampFrequency, "I915_PARAM_CS_TIMESTAMP_FREQUENCY"}};
    for (auto &ioctlCodeString : ioctlCodeStringMap) {
        EXPECT_STREQ(getDrmParamString(ioctlCodeString.first, &ioctlHelper).c_str(), ioctlCodeString.second);
        EXPECT_THROW(getDrmParamString(ioctlCodeString.first, nullptr), std::runtime_error);
    }

-    EXPECT_STREQ(getDrmParamString(DrmParam::ParamChipsetId, &ioctlHelper).c_str(), "I915_PARAM_CHIPSET_ID");
-    EXPECT_STREQ(getDrmParamString(DrmParam::ParamChipsetId, nullptr).c_str(), "I915_PARAM_CHIPSET_ID");
-    EXPECT_STREQ(getDrmParamString(DrmParam::ParamRevision, &ioctlHelper).c_str(), "I915_PARAM_REVISION");
-    EXPECT_STREQ(getDrmParamString(DrmParam::ParamRevision, nullptr).c_str(), "I915_PARAM_REVISION");
+    EXPECT_STREQ(getDrmParamString(DrmParam::paramChipsetId, &ioctlHelper).c_str(), "I915_PARAM_CHIPSET_ID");
+    EXPECT_STREQ(getDrmParamString(DrmParam::paramChipsetId, nullptr).c_str(), "I915_PARAM_CHIPSET_ID");
+    EXPECT_STREQ(getDrmParamString(DrmParam::paramRevision, &ioctlHelper).c_str(), "I915_PARAM_REVISION");
+    EXPECT_STREQ(getDrmParamString(DrmParam::paramRevision, nullptr).c_str(), "I915_PARAM_REVISION");

-    EXPECT_THROW(getDrmParamString(DrmParam::EngineClassRender, &ioctlHelper), std::runtime_error);
+    EXPECT_THROW(getDrmParamString(DrmParam::engineClassRender, &ioctlHelper), std::runtime_error);
 }

 TEST(DrmWrapperTest, givenEAgainOrEIntrOrEBusyWhenCheckingIfReinvokeRequiredThenTrueIsReturned) {
@@ -1555,14 +1555,14 @@ TEST(IoctlHelperTest, whenGettingDrmParamValueThenProperValueIsReturned) {
    auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
    DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
    auto ioctlHelper = drm.getIoctlHelper();
-    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER), ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender));
-    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY), ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy));
-    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO), ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideo));
-    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE), ioctlHelper->getDrmParamValue(DrmParam::EngineClassVideoEnhance));
-    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID), ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalid));
-    EXPECT_EQ(static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE), ioctlHelper->getDrmParamValue(DrmParam::EngineClassInvalidNone));
+    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER), ioctlHelper->getDrmParamValue(DrmParam::engineClassRender));
+    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY), ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy));
+    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO), ioctlHelper->getDrmParamValue(DrmParam::engineClassVideo));
+    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE), ioctlHelper->getDrmParamValue(DrmParam::engineClassVideoEnhance));
+    EXPECT_EQ(static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID), ioctlHelper->getDrmParamValue(DrmParam::engineClassInvalid));
+    EXPECT_EQ(static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE), ioctlHelper->getDrmParamValue(DrmParam::engineClassInvalidNone));

-    EXPECT_THROW(ioctlHelper->getDrmParamValueBase(DrmParam::EngineClassCompute), std::runtime_error);
+    EXPECT_THROW(ioctlHelper->getDrmParamValueBase(DrmParam::engineClassCompute), std::runtime_error);
 }

 TEST(IoctlHelperTest, whenGettingFileNameForFrequencyFilesThenProperStringIsReturned) {
@@ -1608,9 +1608,9 @@ TEST(DistanceInfoTest, givenDistanceInfosWhenAssignRegionsFromDistancesThenCorre
    auto memoryInfo = std::make_unique<MemoryInfo>(memRegions, drm);

    std::vector<EngineClassInstance> engines(3);
-    engines[0] = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 0};
-    engines[1] = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 0};
-    engines[2] = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 2};
+    engines[0] = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 0};
+    engines[1] = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)), 0};
+    engines[2] = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)), 2};

    auto distances = std::vector<DistanceInfo>();
    for (const auto &region : memRegions) {
--- a/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp
@@ -613,11 +613,11 @@ TEST_F(IoctlHelperPrelimFixture, givenVariousDirectSubmissionFlagSettingWhenCrea
 TEST_F(IoctlHelperPrelimFixture, givenPrelimsWhenQueryDistancesThenCorrectDistanceSet) {
    auto ioctlHelper = drm->getIoctlHelper();
    std::vector<DistanceInfo> distances(3);
-    distances[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 0};
+    distances[0].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 0};
    distances[0].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 0};
-    distances[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassRender)), 1};
+    distances[1].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassRender)), 1};
    distances[1].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 1};
-    distances[2].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::EngineClassCopy)), 4};
+    distances[2].engine = {static_cast<uint16_t>(ioctlHelper->getDrmParamValue(DrmParam::engineClassCopy)), 4};
    distances[2].region = {drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE, 2};
    std::vector<QueryItem> queryItems(distances.size());
    auto ret = ioctlHelper->queryDistances(queryItems, distances);
--- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp
+++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp
@@ -161,15 +161,15 @@ DG1TEST_F(IoctlHelperTestsDg1, whenGettingDrmParamStringThenProperStringIsReturn
    auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
    auto drm = std::make_unique<DrmMockProdDg1>(*executionEnvironment->rootDeviceEnvironments[0]);
    auto &ioctlHelper = *drm->getIoctlHelper();
-    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::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::ParamHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamSubsliceTotal).c_str(), "I915_PARAM_SUBSLICE_TOTAL");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamMinEuInPool).c_str(), "I915_PARAM_MIN_EU_IN_POOL");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamCsTimestampFrequency).c_str(), "I915_PARAM_CS_TIMESTAMP_FREQUENCY");
+    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::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::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramSubsliceTotal).c_str(), "I915_PARAM_SUBSLICE_TOTAL");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramMinEuInPool).c_str(), "I915_PARAM_MIN_EU_IN_POOL");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramCsTimestampFrequency).c_str(), "I915_PARAM_CS_TIMESTAMP_FREQUENCY");
 }

 DG1TEST_F(IoctlHelperTestsDg1, givenUpstreamWhenGetFdFromVmExportIsCalledThenFalseIsReturned) {
--- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp
+++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp
@@ -82,17 +82,17 @@ TEST_F(IoctlPrelimHelperTests, whenGettingIoctlRequestValueThenPropertValueIsRet
 }

 TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamStringThenProperStringIsReturned) {
-    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::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::ParamHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamSubsliceTotal).c_str(), "I915_PARAM_SUBSLICE_TOTAL");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamMinEuInPool).c_str(), "I915_PARAM_MIN_EU_IN_POOL");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamCsTimestampFrequency).c_str(), "I915_PARAM_CS_TIMESTAMP_FREQUENCY");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamHasVmBind).c_str(), "PRELIM_I915_PARAM_HAS_VM_BIND");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamHasPageFault).c_str(), "PRELIM_I915_PARAM_HAS_PAGE_FAULT");
+    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::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::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramSubsliceTotal).c_str(), "I915_PARAM_SUBSLICE_TOTAL");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramMinEuInPool).c_str(), "I915_PARAM_MIN_EU_IN_POOL");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramCsTimestampFrequency).c_str(), "I915_PARAM_CS_TIMESTAMP_FREQUENCY");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasVmBind).c_str(), "PRELIM_I915_PARAM_HAS_VM_BIND");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPageFault).c_str(), "PRELIM_I915_PARAM_HAS_PAGE_FAULT");
 }

 TEST_F(IoctlPrelimHelperTests, whenGettingIoctlRequestStringThenProperStringIsReturned) {
@@ -134,50 +134,50 @@ TEST_F(IoctlPrelimHelperTests, whenGettingIoctlRequestStringThenProperStringIsRe
 }

 TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamValueThenPropertValueIsReturned) {
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextCreateExtSetparam), static_cast<int>(I915_CONTEXT_CREATE_EXT_SETPARAM));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextCreateFlagsUseExtensions), static_cast<int>(I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextEnginesExtLoadBalance), static_cast<int>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamEngines), static_cast<int>(I915_CONTEXT_PARAM_ENGINES));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamGttSize), static_cast<int>(I915_CONTEXT_PARAM_GTT_SIZE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamPersistence), static_cast<int>(I915_CONTEXT_PARAM_PERSISTENCE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamPriority), static_cast<int>(I915_CONTEXT_PARAM_PRIORITY));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamRecoverable), static_cast<int>(I915_CONTEXT_PARAM_RECOVERABLE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamSseu), static_cast<int>(I915_CONTEXT_PARAM_SSEU));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamVm), static_cast<int>(I915_CONTEXT_PARAM_VM));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCompute), static_cast<int>(prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassRender), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCopy), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideo), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideoEnhance), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalid), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalidNone), static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecBlt), static_cast<int>(I915_EXEC_BLT));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecDefault), static_cast<int>(I915_EXEC_DEFAULT));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecNoReloc), static_cast<int>(I915_EXEC_NO_RELOC));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecRender), static_cast<int>(I915_EXEC_RENDER));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassDevice), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassSystem), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MmapOffsetWb), static_cast<int>(I915_MMAP_OFFSET_WB));
-    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::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::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::ParamSubsliceTotal), static_cast<int>(I915_PARAM_SUBSLICE_TOTAL));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamMinEuInPool), static_cast<int>(I915_PARAM_MIN_EU_IN_POOL));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamCsTimestampFrequency), static_cast<int>(I915_PARAM_CS_TIMESTAMP_FREQUENCY));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamHasVmBind), static_cast<int>(PRELIM_I915_PARAM_HAS_VM_BIND));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamHasPageFault), static_cast<int>(PRELIM_I915_PARAM_HAS_PAGE_FAULT));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryEngineInfo), static_cast<int>(DRM_I915_QUERY_ENGINE_INFO));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryHwconfigTable), static_cast<int>(PRELIM_DRM_I915_QUERY_HWCONFIG_TABLE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryMemoryRegions), static_cast<int>(DRM_I915_QUERY_MEMORY_REGIONS));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryComputeSlices), static_cast<int>(PRELIM_DRM_I915_QUERY_COMPUTE_SUBSLICES));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryTopologyInfo), static_cast<int>(DRM_I915_QUERY_TOPOLOGY_INFO));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::SchedulerCapPreemption), static_cast<int>(I915_SCHEDULER_CAP_PREEMPTION));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::TilingNone), static_cast<int>(I915_TILING_NONE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::TilingY), static_cast<int>(I915_TILING_Y));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextCreateExtSetparam), static_cast<int>(I915_CONTEXT_CREATE_EXT_SETPARAM));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextCreateFlagsUseExtensions), static_cast<int>(I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextEnginesExtLoadBalance), static_cast<int>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamEngines), static_cast<int>(I915_CONTEXT_PARAM_ENGINES));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamGttSize), static_cast<int>(I915_CONTEXT_PARAM_GTT_SIZE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamPersistence), static_cast<int>(I915_CONTEXT_PARAM_PERSISTENCE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamPriority), static_cast<int>(I915_CONTEXT_PARAM_PRIORITY));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamRecoverable), static_cast<int>(I915_CONTEXT_PARAM_RECOVERABLE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamSseu), static_cast<int>(I915_CONTEXT_PARAM_SSEU));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamVm), static_cast<int>(I915_CONTEXT_PARAM_VM));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassCompute), static_cast<int>(prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassRender), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassCopy), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassVideo), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassVideoEnhance), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassInvalid), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassInvalidNone), static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::execBlt), static_cast<int>(I915_EXEC_BLT));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::execDefault), static_cast<int>(I915_EXEC_DEFAULT));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::execNoReloc), static_cast<int>(I915_EXEC_NO_RELOC));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::execRender), static_cast<int>(I915_EXEC_RENDER));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::memoryClassDevice), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::memoryClassSystem), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWb), static_cast<int>(I915_MMAP_OFFSET_WB));
+    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::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::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::paramSubsliceTotal), static_cast<int>(I915_PARAM_SUBSLICE_TOTAL));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramMinEuInPool), static_cast<int>(I915_PARAM_MIN_EU_IN_POOL));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramCsTimestampFrequency), static_cast<int>(I915_PARAM_CS_TIMESTAMP_FREQUENCY));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasVmBind), static_cast<int>(PRELIM_I915_PARAM_HAS_VM_BIND));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasPageFault), static_cast<int>(PRELIM_I915_PARAM_HAS_PAGE_FAULT));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryEngineInfo), static_cast<int>(DRM_I915_QUERY_ENGINE_INFO));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryHwconfigTable), static_cast<int>(PRELIM_DRM_I915_QUERY_HWCONFIG_TABLE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryMemoryRegions), static_cast<int>(DRM_I915_QUERY_MEMORY_REGIONS));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryComputeSlices), static_cast<int>(PRELIM_DRM_I915_QUERY_COMPUTE_SUBSLICES));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryTopologyInfo), static_cast<int>(DRM_I915_QUERY_TOPOLOGY_INFO));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::schedulerCapPreemption), static_cast<int>(I915_SCHEDULER_CAP_PREEMPTION));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::tilingNone), static_cast<int>(I915_TILING_NONE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::tilingY), static_cast<int>(I915_TILING_Y));
 }

 TEST_F(IoctlPrelimHelperTests, givenPrelimsWhenTranslateToMemoryRegionsThenReturnSameData) {
@@ -295,8 +295,8 @@ TEST_F(IoctlPrelimHelperTests, givenPrelimsWhenGetDirectSubmissionFlagThenCorrec

 TEST_F(IoctlPrelimHelperTests, givenPrelimsWhenTranslateToEngineCapsThenReturnSameData) {
    std::vector<EngineCapabilities> expectedEngines(2);
-    expectedEngines[0] = {{static_cast<uint16_t>(ioctlHelper.getDrmParamValue(DrmParam::EngineClassRender)), 0}, 0};
-    expectedEngines[1] = {{static_cast<uint16_t>(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCopy)), 1}, 0};
+    expectedEngines[0] = {{static_cast<uint16_t>(ioctlHelper.getDrmParamValue(DrmParam::engineClassRender)), 0}, 0};
+    expectedEngines[1] = {{static_cast<uint16_t>(ioctlHelper.getDrmParamValue(DrmParam::engineClassCopy)), 1}, 0};

    auto engineInfo = getEngineInfo(expectedEngines);

@@ -577,11 +577,11 @@ TEST_F(IoctlPrelimHelperTests, whenGettingPreferredLocationRegionThenReturnCorre
    EXPECT_EQ(std::nullopt, ioctlHelper.getPreferredLocationRegion(PreferredLocation::none, 0));

    auto region = ioctlHelper.getPreferredLocationRegion(PreferredLocation::system, 0);
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassSystem), region->memoryClass);
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::memoryClassSystem), region->memoryClass);
    EXPECT_EQ(0u, region->memoryInstance);

    region = ioctlHelper.getPreferredLocationRegion(PreferredLocation::device, 1);
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassDevice), region->memoryClass);
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::memoryClassDevice), region->memoryClass);
    EXPECT_EQ(1u, region->memoryInstance);

    region = ioctlHelper.getPreferredLocationRegion(PreferredLocation::clear, 1);
@@ -590,7 +590,7 @@ TEST_F(IoctlPrelimHelperTests, whenGettingPreferredLocationRegionThenReturnCorre

    debugManager.flags.SetVmAdvisePreferredLocation.set(3);
    region = ioctlHelper.getPreferredLocationRegion(PreferredLocation::none, 1);
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassDevice), region->memoryClass);
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::memoryClassDevice), region->memoryClass);
    EXPECT_EQ(1u, region->memoryInstance);
 }

--- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp
+++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp
@@ -206,63 +206,63 @@ TEST(IoctlHelperUpstreamTest, whenGettingDrmParamStringThenProperStringIsReturne
    auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
    auto drm = std::make_unique<DrmTipMock>(*executionEnvironment->rootDeviceEnvironments[0]);
    IoctlHelperUpstream ioctlHelper{*drm};
-    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::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::ParamHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamSubsliceTotal).c_str(), "I915_PARAM_SUBSLICE_TOTAL");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamMinEuInPool).c_str(), "I915_PARAM_MIN_EU_IN_POOL");
-    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::ParamCsTimestampFrequency).c_str(), "I915_PARAM_CS_TIMESTAMP_FREQUENCY");
+    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::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::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramSubsliceTotal).c_str(), "I915_PARAM_SUBSLICE_TOTAL");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramMinEuInPool).c_str(), "I915_PARAM_MIN_EU_IN_POOL");
+    EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramCsTimestampFrequency).c_str(), "I915_PARAM_CS_TIMESTAMP_FREQUENCY");
 }

 TEST(IoctlHelperUpstreamTest, whenGettingDrmParamValueThenPropertValueIsReturned) {
    auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
    auto drm = std::make_unique<DrmTipMock>(*executionEnvironment->rootDeviceEnvironments[0]);
    IoctlHelperUpstream ioctlHelper{*drm};
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextCreateExtSetparam), static_cast<int>(I915_CONTEXT_CREATE_EXT_SETPARAM));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextCreateFlagsUseExtensions), static_cast<int>(I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextEnginesExtLoadBalance), static_cast<int>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamEngines), static_cast<int>(I915_CONTEXT_PARAM_ENGINES));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamGttSize), static_cast<int>(I915_CONTEXT_PARAM_GTT_SIZE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamPersistence), static_cast<int>(I915_CONTEXT_PARAM_PERSISTENCE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamPriority), static_cast<int>(I915_CONTEXT_PARAM_PRIORITY));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamRecoverable), static_cast<int>(I915_CONTEXT_PARAM_RECOVERABLE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamSseu), static_cast<int>(I915_CONTEXT_PARAM_SSEU));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ContextParamVm), static_cast<int>(I915_CONTEXT_PARAM_VM));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCompute), 4);
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassRender), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCopy), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideo), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassVideoEnhance), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalid), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassInvalidNone), static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecBlt), static_cast<int>(I915_EXEC_BLT));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecDefault), static_cast<int>(I915_EXEC_DEFAULT));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecNoReloc), static_cast<int>(I915_EXEC_NO_RELOC));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ExecRender), static_cast<int>(I915_EXEC_RENDER));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassDevice), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MemoryClassSystem), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::MmapOffsetWb), static_cast<int>(I915_MMAP_OFFSET_WB));
-    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::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::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::ParamSubsliceTotal), static_cast<int>(I915_PARAM_SUBSLICE_TOTAL));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamMinEuInPool), static_cast<int>(I915_PARAM_MIN_EU_IN_POOL));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::ParamCsTimestampFrequency), static_cast<int>(I915_PARAM_CS_TIMESTAMP_FREQUENCY));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryEngineInfo), static_cast<int>(DRM_I915_QUERY_ENGINE_INFO));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryHwconfigTable), static_cast<int>(DRM_I915_QUERY_HWCONFIG_BLOB));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryMemoryRegions), static_cast<int>(DRM_I915_QUERY_MEMORY_REGIONS));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryTopologyInfo), static_cast<int>(DRM_I915_QUERY_TOPOLOGY_INFO));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryComputeSlices), 0);
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::SchedulerCapPreemption), static_cast<int>(I915_SCHEDULER_CAP_PREEMPTION));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::TilingNone), static_cast<int>(I915_TILING_NONE));
-    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::TilingY), static_cast<int>(I915_TILING_Y));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextCreateExtSetparam), static_cast<int>(I915_CONTEXT_CREATE_EXT_SETPARAM));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextCreateFlagsUseExtensions), static_cast<int>(I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextEnginesExtLoadBalance), static_cast<int>(I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamEngines), static_cast<int>(I915_CONTEXT_PARAM_ENGINES));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamGttSize), static_cast<int>(I915_CONTEXT_PARAM_GTT_SIZE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamPersistence), static_cast<int>(I915_CONTEXT_PARAM_PERSISTENCE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamPriority), static_cast<int>(I915_CONTEXT_PARAM_PRIORITY));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamRecoverable), static_cast<int>(I915_CONTEXT_PARAM_RECOVERABLE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamSseu), static_cast<int>(I915_CONTEXT_PARAM_SSEU));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::contextParamVm), static_cast<int>(I915_CONTEXT_PARAM_VM));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassCompute), 4);
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassRender), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassCopy), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassVideo), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassVideoEnhance), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassInvalid), static_cast<int>(drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::engineClassInvalidNone), static_cast<int>(I915_ENGINE_CLASS_INVALID_NONE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::execBlt), static_cast<int>(I915_EXEC_BLT));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::execDefault), static_cast<int>(I915_EXEC_DEFAULT));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::execNoReloc), static_cast<int>(I915_EXEC_NO_RELOC));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::execRender), static_cast<int>(I915_EXEC_RENDER));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::memoryClassDevice), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::memoryClassSystem), static_cast<int>(drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWb), static_cast<int>(I915_MMAP_OFFSET_WB));
+    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::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::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::paramSubsliceTotal), static_cast<int>(I915_PARAM_SUBSLICE_TOTAL));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramMinEuInPool), static_cast<int>(I915_PARAM_MIN_EU_IN_POOL));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramCsTimestampFrequency), static_cast<int>(I915_PARAM_CS_TIMESTAMP_FREQUENCY));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryEngineInfo), static_cast<int>(DRM_I915_QUERY_ENGINE_INFO));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryHwconfigTable), static_cast<int>(DRM_I915_QUERY_HWCONFIG_BLOB));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryMemoryRegions), static_cast<int>(DRM_I915_QUERY_MEMORY_REGIONS));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryTopologyInfo), static_cast<int>(DRM_I915_QUERY_TOPOLOGY_INFO));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::queryComputeSlices), 0);
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::schedulerCapPreemption), static_cast<int>(I915_SCHEDULER_CAP_PREEMPTION));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::tilingNone), static_cast<int>(I915_TILING_NONE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::tilingY), static_cast<int>(I915_TILING_Y));
 }

 TEST(IoctlHelperUpstreamTest, whenCreatingVmControlRegionExtThenNullptrIsReturned) {
--- a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
@@ -317,63 +317,63 @@ TEST(IoctlHelperXeTest, givenIoctlHelperXeWhenCallingAnyMethodThenDummyValueIsRe
    EXPECT_FALSE(xeIoctlHelper->isDebugAttachAvailable());

    // Default no translation:
-    verifyDrmGetParamValue(static_cast<int>(DrmParam::ExecRender), DrmParam::ExecRender);
+    verifyDrmGetParamValue(static_cast<int>(DrmParam::execRender), DrmParam::execRender);
    // test exception:
-    verifyDrmGetParamValue(DRM_XE_MEM_REGION_CLASS_VRAM, DrmParam::MemoryClassDevice);
-    verifyDrmGetParamValue(DRM_XE_MEM_REGION_CLASS_SYSMEM, DrmParam::MemoryClassSystem);
-    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_RENDER, DrmParam::EngineClassRender);
-    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_COPY, DrmParam::EngineClassCopy);
-    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_VIDEO_DECODE, DrmParam::EngineClassVideo);
-    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE, DrmParam::EngineClassVideoEnhance);
-    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_COMPUTE, DrmParam::EngineClassCompute);
-    verifyDrmGetParamValue(-1, DrmParam::EngineClassInvalid);
+    verifyDrmGetParamValue(DRM_XE_MEM_REGION_CLASS_VRAM, DrmParam::memoryClassDevice);
+    verifyDrmGetParamValue(DRM_XE_MEM_REGION_CLASS_SYSMEM, DrmParam::memoryClassSystem);
+    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_RENDER, DrmParam::engineClassRender);
+    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_COPY, DrmParam::engineClassCopy);
+    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_VIDEO_DECODE, DrmParam::engineClassVideo);
+    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE, DrmParam::engineClassVideoEnhance);
+    verifyDrmGetParamValue(DRM_XE_ENGINE_CLASS_COMPUTE, DrmParam::engineClassCompute);
+    verifyDrmGetParamValue(-1, DrmParam::engineClassInvalid);

    // Expect stringify
-    verifyDrmParamString("ContextCreateExtSetparam", DrmParam::ContextCreateExtSetparam);
-    verifyDrmParamString("ContextCreateExtSetparam", DrmParam::ContextCreateExtSetparam);
-    verifyDrmParamString("ContextCreateFlagsUseExtensions", DrmParam::ContextCreateFlagsUseExtensions);
-    verifyDrmParamString("ContextEnginesExtLoadBalance", DrmParam::ContextEnginesExtLoadBalance);
-    verifyDrmParamString("ContextParamEngines", DrmParam::ContextParamEngines);
-    verifyDrmParamString("ContextParamGttSize", DrmParam::ContextParamGttSize);
-    verifyDrmParamString("ContextParamPersistence", DrmParam::ContextParamPersistence);
-    verifyDrmParamString("ContextParamPriority", DrmParam::ContextParamPriority);
-    verifyDrmParamString("ContextParamRecoverable", DrmParam::ContextParamRecoverable);
-    verifyDrmParamString("ContextParamSseu", DrmParam::ContextParamSseu);
-    verifyDrmParamString("ContextParamVm", DrmParam::ContextParamVm);
-    verifyDrmParamString("EngineClassRender", DrmParam::EngineClassRender);
-    verifyDrmParamString("EngineClassCompute", DrmParam::EngineClassCompute);
-    verifyDrmParamString("EngineClassCopy", DrmParam::EngineClassCopy);
-    verifyDrmParamString("EngineClassVideo", DrmParam::EngineClassVideo);
-    verifyDrmParamString("EngineClassVideoEnhance", DrmParam::EngineClassVideoEnhance);
-    verifyDrmParamString("EngineClassInvalid", DrmParam::EngineClassInvalid);
-    verifyDrmParamString("EngineClassInvalidNone", DrmParam::EngineClassInvalidNone);
-    verifyDrmParamString("ExecBlt", DrmParam::ExecBlt);
-    verifyDrmParamString("ExecDefault", DrmParam::ExecDefault);
-    verifyDrmParamString("ExecNoReloc", DrmParam::ExecNoReloc);
-    verifyDrmParamString("ExecRender", DrmParam::ExecRender);
-    verifyDrmParamString("MemoryClassDevice", DrmParam::MemoryClassDevice);
-    verifyDrmParamString("MemoryClassSystem", DrmParam::MemoryClassSystem);
-    verifyDrmParamString("MmapOffsetWb", DrmParam::MmapOffsetWb);
-    verifyDrmParamString("MmapOffsetWc", DrmParam::MmapOffsetWc);
-    verifyDrmParamString("ParamChipsetId", DrmParam::ParamChipsetId);
-    verifyDrmParamString("ParamRevision", DrmParam::ParamRevision);
-    verifyDrmParamString("ParamHasExecSoftpin", DrmParam::ParamHasExecSoftpin);
-    verifyDrmParamString("ParamHasPooledEu", DrmParam::ParamHasPooledEu);
-    verifyDrmParamString("ParamHasScheduler", DrmParam::ParamHasScheduler);
-    verifyDrmParamString("ParamEuTotal", DrmParam::ParamEuTotal);
-    verifyDrmParamString("ParamSubsliceTotal", DrmParam::ParamSubsliceTotal);
-    verifyDrmParamString("ParamMinEuInPool", DrmParam::ParamMinEuInPool);
-    verifyDrmParamString("ParamCsTimestampFrequency", DrmParam::ParamCsTimestampFrequency);
-    verifyDrmParamString("ParamHasVmBind", DrmParam::ParamHasVmBind);
-    verifyDrmParamString("ParamHasPageFault", DrmParam::ParamHasPageFault);
-    verifyDrmParamString("QueryEngineInfo", DrmParam::QueryEngineInfo);
-    verifyDrmParamString("QueryHwconfigTable", DrmParam::QueryHwconfigTable);
-    verifyDrmParamString("QueryComputeSlices", DrmParam::QueryComputeSlices);
-    verifyDrmParamString("QueryMemoryRegions", DrmParam::QueryMemoryRegions);
-    verifyDrmParamString("QueryTopologyInfo", DrmParam::QueryTopologyInfo);
-    verifyDrmParamString("SchedulerCapPreemption", DrmParam::SchedulerCapPreemption);
-    verifyDrmParamString("TilingNone", DrmParam::TilingNone);
-    verifyDrmParamString("TilingY", DrmParam::TilingY);
+    verifyDrmParamString("ContextCreateExtSetparam", DrmParam::contextCreateExtSetparam);
+    verifyDrmParamString("ContextCreateExtSetparam", DrmParam::contextCreateExtSetparam);
+    verifyDrmParamString("ContextCreateFlagsUseExtensions", DrmParam::contextCreateFlagsUseExtensions);
+    verifyDrmParamString("ContextEnginesExtLoadBalance", DrmParam::contextEnginesExtLoadBalance);
+    verifyDrmParamString("ContextParamEngines", DrmParam::contextParamEngines);
+    verifyDrmParamString("ContextParamGttSize", DrmParam::contextParamGttSize);
+    verifyDrmParamString("ContextParamPersistence", DrmParam::contextParamPersistence);
+    verifyDrmParamString("ContextParamPriority", DrmParam::contextParamPriority);
+    verifyDrmParamString("ContextParamRecoverable", DrmParam::contextParamRecoverable);
+    verifyDrmParamString("ContextParamSseu", DrmParam::contextParamSseu);
+    verifyDrmParamString("ContextParamVm", DrmParam::contextParamVm);
+    verifyDrmParamString("EngineClassRender", DrmParam::engineClassRender);
+    verifyDrmParamString("EngineClassCompute", DrmParam::engineClassCompute);
+    verifyDrmParamString("EngineClassCopy", DrmParam::engineClassCopy);
+    verifyDrmParamString("EngineClassVideo", DrmParam::engineClassVideo);
+    verifyDrmParamString("EngineClassVideoEnhance", DrmParam::engineClassVideoEnhance);
+    verifyDrmParamString("EngineClassInvalid", DrmParam::engineClassInvalid);
+    verifyDrmParamString("EngineClassInvalidNone", DrmParam::engineClassInvalidNone);
+    verifyDrmParamString("ExecBlt", DrmParam::execBlt);
+    verifyDrmParamString("ExecDefault", DrmParam::execDefault);
+    verifyDrmParamString("ExecNoReloc", DrmParam::execNoReloc);
+    verifyDrmParamString("ExecRender", DrmParam::execRender);
+    verifyDrmParamString("MemoryClassDevice", DrmParam::memoryClassDevice);
+    verifyDrmParamString("MemoryClassSystem", DrmParam::memoryClassSystem);
+    verifyDrmParamString("MmapOffsetWb", DrmParam::mmapOffsetWb);
+    verifyDrmParamString("MmapOffsetWc", DrmParam::mmapOffsetWc);
+    verifyDrmParamString("ParamChipsetId", DrmParam::paramChipsetId);
+    verifyDrmParamString("ParamRevision", DrmParam::paramRevision);
+    verifyDrmParamString("ParamHasExecSoftpin", DrmParam::paramHasExecSoftpin);
+    verifyDrmParamString("ParamHasPooledEu", DrmParam::paramHasPooledEu);
+    verifyDrmParamString("ParamHasScheduler", DrmParam::paramHasScheduler);
+    verifyDrmParamString("ParamEuTotal", DrmParam::paramEuTotal);
+    verifyDrmParamString("ParamSubsliceTotal", DrmParam::paramSubsliceTotal);
+    verifyDrmParamString("ParamMinEuInPool", DrmParam::paramMinEuInPool);
+    verifyDrmParamString("ParamCsTimestampFrequency", DrmParam::paramCsTimestampFrequency);
+    verifyDrmParamString("ParamHasVmBind", DrmParam::paramHasVmBind);
+    verifyDrmParamString("ParamHasPageFault", DrmParam::paramHasPageFault);
+    verifyDrmParamString("QueryEngineInfo", DrmParam::queryEngineInfo);
+    verifyDrmParamString("QueryHwconfigTable", DrmParam::queryHwconfigTable);
+    verifyDrmParamString("QueryComputeSlices", DrmParam::queryComputeSlices);
+    verifyDrmParamString("QueryMemoryRegions", DrmParam::queryMemoryRegions);
+    verifyDrmParamString("QueryTopologyInfo", DrmParam::queryTopologyInfo);
+    verifyDrmParamString("SchedulerCapPreemption", DrmParam::schedulerCapPreemption);
+    verifyDrmParamString("TilingNone", DrmParam::tilingNone);
+    verifyDrmParamString("TilingY", DrmParam::tilingY);

    verifyIoctlString(DrmIoctl::gemClose, "DRM_IOCTL_GEM_CLOSE");
    verifyIoctlString(DrmIoctl::gemCreate, "DRM_IOCTL_XE_GEM_CREATE");
@@ -493,17 +493,17 @@ TEST(IoctlHelperXeTest, verifyPublicFunctions) {
    query.numItems = 1;

    EXPECT_EQ(-1, mockXeIoctlHelper->ioctl(DrmIoctl::query, &query));
-    queryItem.queryId = xeIoctlHelper->getDrmParamValue(DrmParam::QueryHwconfigTable);
+    queryItem.queryId = xeIoctlHelper->getDrmParamValue(DrmParam::queryHwconfigTable);
    mockXeIoctlHelper->ioctl(DrmIoctl::query, &query);
    EXPECT_EQ(0, queryItem.length);

    memset(&queryItem, 0, sizeof(queryItem));
-    queryItem.queryId = xeIoctlHelper->getDrmParamValue(DrmParam::QueryEngineInfo);
+    queryItem.queryId = xeIoctlHelper->getDrmParamValue(DrmParam::queryEngineInfo);
    mockXeIoctlHelper->ioctl(DrmIoctl::query, &query);
    EXPECT_EQ(0, queryItem.length);

    memset(&queryItem, 0, sizeof(queryItem));
-    queryItem.queryId = xeIoctlHelper->getDrmParamValue(DrmParam::QueryTopologyInfo);
+    queryItem.queryId = xeIoctlHelper->getDrmParamValue(DrmParam::queryTopologyInfo);
    mockXeIoctlHelper->ioctl(DrmIoctl::query, &query);
    EXPECT_EQ(0, queryItem.length);
 }
@@ -610,13 +610,13 @@ TEST(IoctlHelperXeTest, whenCallingIoctlThenProperValueIsReturned) {
        GemContextParam test = {};
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::gemContextSetparam, &test);
        EXPECT_EQ(-1, ret);
-        test.param = static_cast<int>(DrmParam::ContextParamPersistence);
+        test.param = static_cast<int>(DrmParam::contextParamPersistence);
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::gemContextSetparam, &test);
        EXPECT_EQ(0, ret);
        test.param = contextPrivateParamBoost;
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::gemContextSetparam, &test);
        EXPECT_EQ(0, ret);
-        test.param = static_cast<int>(DrmParam::ContextParamEngines);
+        test.param = static_cast<int>(DrmParam::contextParamEngines);
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::gemContextSetparam, &test);
        EXPECT_EQ(-1, ret);
    }
@@ -626,17 +626,17 @@ TEST(IoctlHelperXeTest, whenCallingIoctlThenProperValueIsReturned) {
        GemContextParam test = {};
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::gemContextGetparam, &test);
        EXPECT_EQ(-1, ret);
-        test.param = static_cast<int>(DrmParam::ContextParamGttSize);
+        test.param = static_cast<int>(DrmParam::contextParamGttSize);
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::gemContextGetparam, &test);
        EXPECT_EQ(0, ret);

        auto expectedAddressWidth = hwInfo->capabilityTable.gpuAddressSpace + 1u;
        EXPECT_EQ(expectedAddressWidth, test.value);
-        test.param = static_cast<int>(DrmParam::ContextParamSseu);
+        test.param = static_cast<int>(DrmParam::contextParamSseu);
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::gemContextGetparam, &test);
        EXPECT_EQ(0, ret);
        EXPECT_EQ(0x55fdd94d4e40ull, test.value);
-        test.param = static_cast<int>(DrmParam::ContextParamPersistence);
+        test.param = static_cast<int>(DrmParam::contextParamPersistence);
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::gemContextGetparam, &test);
        EXPECT_EQ(0, ret);
        EXPECT_EQ(0x1ull, test.value);
@@ -654,27 +654,27 @@ TEST(IoctlHelperXeTest, whenCallingIoctlThenProperValueIsReturned) {
        test.value = &dstvalue;
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test);
        EXPECT_EQ(-1, ret);
-        test.param = static_cast<int>(DrmParam::ParamChipsetId);
+        test.param = static_cast<int>(DrmParam::paramChipsetId);
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test);
        EXPECT_EQ(0, ret);
        EXPECT_EQ(dstvalue, 0);
-        test.param = static_cast<int>(DrmParam::ParamRevision);
+        test.param = static_cast<int>(DrmParam::paramRevision);
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test);
        EXPECT_EQ(0, ret);
        EXPECT_EQ(dstvalue, 0);
-        test.param = static_cast<int>(DrmParam::ParamHasPageFault);
+        test.param = static_cast<int>(DrmParam::paramHasPageFault);
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test);
        EXPECT_EQ(0, ret);
        EXPECT_EQ(dstvalue, 0);
-        test.param = static_cast<int>(DrmParam::ParamHasExecSoftpin);
+        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);
        EXPECT_EQ(0, ret);
        EXPECT_EQ(static_cast<unsigned int>(dstvalue), 0x80000037);
-        test.param = static_cast<int>(DrmParam::ParamCsTimestampFrequency);
+        test.param = static_cast<int>(DrmParam::paramCsTimestampFrequency);
        ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test);
        EXPECT_EQ(0, ret);
        EXPECT_EQ(dstvalue, 0);