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

Remove drm_query_flags

Browse Source 
Signed-off-by: Daniel Chabrowski daniel.chabrowski@intel.com
Related-To: NEO-6591
This commit is contained in:
Daniel Chabrowski
2022-02-22 17:25:50 +00:00
committed by Compute-Runtime-Automation
parent 7d2d5e5792
commit 187f772ae5
4 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -724,8 +724,6 @@ include_directories(${NEO_SOURCE_DIR}/opencl/source/mem_obj/definitions${BRANCH_
include_directories(${NEO_SOURCE_DIR}/opencl/source/memory_manager/definitions${BRANCH_DIR_SUFFIX})
if(MSVC)
include_directories(${NEO_SOURCE_DIR}/opencl/source/sharings/gl/windows/include)
else()
include_directories(${NEO_SHARED_DIRECTORY}/os_interface/linux/flags${BRANCH_DIR_SUFFIX})
endif()
macro(macro_for_each_core_type)

1
shared/source/os_interface/linux/CMakeLists.txt
View File

@@ -57,7 +57,6 @@ set(NEO_CORE_OS_INTERFACE_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/ioctl_strings_prelim.cpp
${CMAKE_CURRENT_SOURCE_DIR}/engine_info.h
${CMAKE_CURRENT_SOURCE_DIR}/engine_info.cpp
${CMAKE_CURRENT_SOURCE_DIR}/flags${BRANCH_DIR_SUFFIX}drm_query_flags.h
${CMAKE_CURRENT_SOURCE_DIR}/memory_info.h
${CMAKE_CURRENT_SOURCE_DIR}/memory_info.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_context_linux.cpp

10
shared/source/os_interface/linux/drm_neo.cpp
View File

@@ -34,8 +34,6 @@
#include "shared/source/os_interface/os_interface.h"
#include "shared/source/utilities/directory.h"
#include "drm_query_flags.h"
#include <cstdio>
#include <cstring>
#include <linux/limits.h>
@@ -1007,7 +1005,7 @@ int Drm::waitUserFence(uint32_t ctxId, uint64_t address, uint64_t value, ValueWi
bool Drm::querySystemInfo() {
auto request = ioctlHelper->getHwConfigIoctlVal();
auto deviceBlobQuery = this->query(request, DrmQueryItemFlags::empty);
auto deviceBlobQuery = this->query(request, 0);
if (deviceBlobQuery.empty()) {
PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stdout, "%s", "INFO: System Info query failed!\n");
return false;
@@ -1017,7 +1015,7 @@ bool Drm::querySystemInfo() {
}
std::vector<uint8_t> Drm::getMemoryRegions() {
return this->query(ioctlHelper->getMemRegionsIoctlVal(), DrmQueryItemFlags::empty);
return this->query(ioctlHelper->getMemRegionsIoctlVal(), 0);
}
bool Drm::queryMemoryInfo() {
@@ -1031,7 +1029,7 @@ bool Drm::queryMemoryInfo() {
}
bool Drm::queryEngineInfo(bool isSysmanEnabled) {
auto enginesQuery = this->query(ioctlHelper->getEngineInfoIoctlVal(), DrmQueryItemFlags::empty);
auto enginesQuery = this->query(ioctlHelper->getEngineInfoIoctlVal(), 0);
if (enginesQuery.empty()) {
return false;
}
@@ -1186,7 +1184,7 @@ bool Drm::queryTopology(const HardwareInfo &hwInfo, QueryTopologyData &topologyD
// fallback to DRM_I915_QUERY_TOPOLOGY_INFO
auto dataQuery = this->query(DRM_I915_QUERY_TOPOLOGY_INFO, DrmQueryItemFlags::topology);
auto dataQuery = this->query(DRM_I915_QUERY_TOPOLOGY_INFO, 0);
if (dataQuery.empty()) {
return false;
}

17
shared/source/os_interface/linux/flags/drm_query_flags.h
View File

@@ -1,17 +0,0 @@
/*
* Copyright (C) 2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include <cstdint>
namespace NEO {
namespace DrmQueryItemFlags {
constexpr uint32_t empty = 0;
constexpr uint32_t topology = 0;
} // namespace DrmQueryItemFlags
} // namespace NEO