intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Support for L0 to read Device LUID from the WDDM driver using EXT Prop"

Browse Source 
This reverts commit b5b9c3500f.

Signed-off-by: Spruit, Neil R <neil.r.spruit@intel.com>
This commit is contained in:
Spruit, Neil R
2022-10-12 00:11:15 +00:00
committed by Compute-Runtime-Automation
parent 448278ac56
commit 1995fd9d92
16 changed files with 1 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
level_zero/core/source/CMakeLists.txt
View File

@@ -37,7 +37,6 @@ set(L0_RUNTIME_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/device/bcs_split.cpp
${CMAKE_CURRENT_SOURCE_DIR}/device/bcs_split.h
${CMAKE_CURRENT_SOURCE_DIR}/device/device.h
${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp_${DRIVER_MODEL}.cpp
${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/driver/driver_handle.h

13
level_zero/core/source/device/device_imp.cpp
View File

@@ -725,19 +725,6 @@ ze_result_t DeviceImp::getProperties(ze_device_properties_t *pDeviceProperties)
}
memcpy_s(pDeviceProperties->name, ZE_MAX_DEVICE_NAME, name.c_str(), name.length() + 1);
if (pDeviceProperties->pNext) {
ze_base_properties_t *extendedProperties = reinterpret_cast<ze_base_properties_t *>(pDeviceProperties->pNext);
if (extendedProperties->stype == ZE_STRUCTURE_TYPE_DEVICE_LUID_EXT_PROPERTIES) {
ze_device_luid_ext_properties_t *deviceLuidProperties =
reinterpret_cast<ze_device_luid_ext_properties_t *>(extendedProperties);
ze_result_t result = queryDeviceLuid(deviceLuidProperties);
if (result != ZE_RESULT_SUCCESS) {
return result;
}
deviceLuidProperties->nodeMask = 1;
}
}
return ZE_RESULT_SUCCESS;
}

3
level_zero/core/source/device/device_imp.h
View File

@@ -138,9 +138,6 @@ struct DeviceImp : public Device {
CmdListCreateFunPtrT getCmdListCreateFunc(const ze_command_list_desc_t *desc);
FabricVertex *fabricVertex = nullptr;
ze_result_t queryDeviceLuid(ze_device_luid_ext_properties_t *deviceLuidProperties);
ze_result_t setDeviceLuid(ze_device_luid_ext_properties_t *deviceLuidProperties);
protected:
void adjustCommandQueueDesc(uint32_t &ordinal, uint32_t &index);
NEO::EngineGroupType getEngineGroupTypeForOrdinal(uint32_t ordinal) const;

16
level_zero/core/source/device/device_imp_drm.cpp
View File

@@ -1,16 +0,0 @@
/*
* Copyright (C) 2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "level_zero/core/source/device/device_imp.h"
namespace L0 {
ze_result_t DeviceImp::queryDeviceLuid(ze_device_luid_ext_properties_t *deviceLuidProperties) {
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
}
} // namespace L0

36
level_zero/core/source/device/device_imp_drm_or_wddm.cpp
View File

@@ -1,36 +0,0 @@
/*
* Copyright (C) 2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/os_interface/os_interface.h"
#include "shared/source/os_interface/windows/hw_device_id.h"
#include "shared/source/os_interface/windows/os_context_win.h"
#include "shared/source/os_interface/windows/wddm/wddm.h"
#include "level_zero/core/source/device/device_imp.h"
namespace L0 {
ze_result_t DeviceImp::queryDeviceLuid(ze_device_luid_ext_properties_t *deviceLuidProperties) {
NEO::Device *activeDevice = getActiveDevice();
if (activeDevice->getRootDeviceEnvironment().osInterface) {
NEO::DriverModelType driverType = neoDevice->getRootDeviceEnvironment().osInterface->getDriverModel()->getDriverModelType();
if (driverType == NEO::DriverModelType::WDDM) {
NEO::CommandStreamReceiver *csr = activeDevice->getDefaultEngine().commandStreamReceiver;
NEO::OsContextWin *context = static_cast<NEO::OsContextWin *>(&csr->getOsContext());
std::vector<uint8_t> luidData;
context->getDeviceLuidArray(luidData, ZE_MAX_DEVICE_LUID_SIZE_EXT);
std::copy_n(luidData.begin(), ZE_MAX_DEVICE_LUID_SIZE_EXT, std::begin(deviceLuidProperties->luid.id));
return ZE_RESULT_SUCCESS;
} else {
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
}
}
return ZE_RESULT_ERROR_UNINITIALIZED;
}
} // namespace L0

28
level_zero/core/source/device/device_imp_wddm.cpp
View File

@@ -1,28 +0,0 @@
/*
* Copyright (C) 2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/os_interface/os_context.h"
#include "shared/source/os_interface/windows/hw_device_id.h"
#include "shared/source/os_interface/windows/os_context_win.h"
#include "shared/source/os_interface/windows/wddm/wddm.h"
#include "level_zero/core/source/device/device_imp.h"
namespace L0 {
ze_result_t DeviceImp::queryDeviceLuid(ze_device_luid_ext_properties_t *deviceLuidProperties) {
NEO::Device *activeDevice = getActiveDevice();
NEO::CommandStreamReceiver *csr = activeDevice->getDefaultEngine().commandStreamReceiver;
NEO::OsContextWin *context = static_cast<NEO::OsContextWin *>(&csr->getOsContext());
std::vector<uint8_t> luidData;
context->getDeviceLuidArray(luidData, ZE_MAX_DEVICE_LUID_SIZE_EXT);
std::copy_n(luidData.begin(), ZE_MAX_DEVICE_LUID_SIZE_EXT, std::begin(deviceLuidProperties->luid.id));
return ZE_RESULT_SUCCESS;
}
} // namespace L0

3
level_zero/core/source/driver/driver_handle_imp.h
View File

@@ -101,8 +101,7 @@ struct DriverHandleImp : public DriverHandle {
{ZE_DEVICE_MEMORY_PROPERTIES_EXT_NAME, ZE_DEVICE_MEMORY_PROPERTIES_EXT_VERSION_CURRENT},
{ZE_RAYTRACING_EXT_NAME, ZE_RAYTRACING_EXT_VERSION_CURRENT},
{ZE_CONTEXT_POWER_SAVING_HINT_EXP_NAME, ZE_POWER_SAVING_HINT_EXP_VERSION_CURRENT},
{ZE_CACHE_RESERVATION_EXT_NAME, ZE_CACHE_RESERVATION_EXT_VERSION_CURRENT},
{ZE_DEVICE_LUID_EXT_NAME, ZE_DEVICE_LUID_EXT_VERSION_CURRENT}};
{ZE_CACHE_RESERVATION_EXT_NAME, ZE_CACHE_RESERVATION_EXT_VERSION_CURRENT}};
uint64_t uuidTimestamp = 0u;