intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-25 13:33:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dont use global namespaces of i915 definitions

Browse Source 
Related-To: NEO-6852
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-07-18 12:53:55 +00:00
committed by Compute-Runtime-Automation
parent 4ec546640f
commit a4e9ede440
34 changed files with 441 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
shared/source/os_interface/linux/i915.h
View File

@@ -5,9 +5,49 @@
*
*/
#ifndef _UAPI_I915_DRM_H_
#include <linux/types.h>
#include <sys/ioctl.h>
namespace NEO {
namespace I915 {
#include "drm/i915_drm.h"
}
} // namespace NEO
using namespace NEO::I915;
using NEO::I915::drm_gem_close;
using NEO::I915::drm_i915_engine_info;
using NEO::I915::drm_i915_gem_context_create_ext;
using NEO::I915::drm_i915_gem_context_create_ext_setparam;
using NEO::I915::drm_i915_gem_context_destroy;
using NEO::I915::drm_i915_gem_context_param;
using NEO::I915::drm_i915_gem_context_param_sseu;
using NEO::I915::drm_i915_gem_create;
using NEO::I915::drm_i915_gem_create_ext;
using NEO::I915::drm_i915_gem_engine_class;
using NEO::I915::drm_i915_gem_exec_object2;
using NEO::I915::drm_i915_gem_execbuffer2;
using NEO::I915::drm_i915_gem_get_tiling;
using NEO::I915::drm_i915_gem_memory_class;
using NEO::I915::drm_i915_gem_memory_class_instance;
using NEO::I915::drm_i915_gem_mmap_offset;
using NEO::I915::drm_i915_gem_set_domain;
using NEO::I915::drm_i915_gem_set_tiling;
using NEO::I915::drm_i915_gem_userptr;
using NEO::I915::drm_i915_gem_vm_control;
using NEO::I915::drm_i915_gem_wait;
using NEO::I915::drm_i915_getparam;
using NEO::I915::drm_i915_getparam_t;
using NEO::I915::drm_i915_memory_region_info;
using NEO::I915::drm_i915_perf_open_param;
using NEO::I915::drm_i915_query;
using NEO::I915::drm_i915_query_engine_info;
using NEO::I915::drm_i915_query_item;
using NEO::I915::drm_i915_query_memory_regions;
using NEO::I915::drm_i915_query_topology_info;
using NEO::I915::drm_i915_reg_read;
using NEO::I915::drm_i915_reset_stats;
using NEO::I915::drm_prime_handle;
using NEO::I915::drm_version;
using NEO::I915::i915_engine_class_instance;
using NEO::I915::i915_user_extension;
#endif

69
shared/source/os_interface/linux/i915_prelim.h
View File

@@ -5,9 +5,76 @@
*
*/
#include <linux/types.h>
#include <sys/ioctl.h>
namespace NEO {
namespace PrelimI915 {
#include "third_party/uapi/prelim/drm/i915_drm.h"
}
} // namespace NEO
using namespace NEO::PrelimI915;
using NEO::PrelimI915::drm_gem_close;
using NEO::PrelimI915::drm_i915_engine_info;
using NEO::PrelimI915::drm_i915_gem_context_create_ext;
using NEO::PrelimI915::drm_i915_gem_context_destroy;
using NEO::PrelimI915::drm_i915_gem_context_param;
using NEO::PrelimI915::drm_i915_gem_create;
using NEO::PrelimI915::drm_i915_gem_engine_class;
using NEO::PrelimI915::drm_i915_gem_execbuffer2;
using NEO::PrelimI915::drm_i915_gem_get_tiling;
using NEO::PrelimI915::drm_i915_gem_memory_class;
using NEO::PrelimI915::drm_i915_gem_mmap_offset;
using NEO::PrelimI915::drm_i915_gem_set_domain;
using NEO::PrelimI915::drm_i915_gem_set_tiling;
using NEO::PrelimI915::drm_i915_gem_userptr;
using NEO::PrelimI915::drm_i915_gem_vm_control;
using NEO::PrelimI915::drm_i915_gem_wait;
using NEO::PrelimI915::drm_i915_getparam_t;
using NEO::PrelimI915::drm_i915_memory_region_info;
using NEO::PrelimI915::drm_i915_query;
using NEO::PrelimI915::drm_i915_query_engine_info;
using NEO::PrelimI915::drm_i915_query_memory_regions;
using NEO::PrelimI915::drm_i915_reg_read;
using NEO::PrelimI915::drm_i915_reset_stats;
using NEO::PrelimI915::drm_prime_handle;
using NEO::PrelimI915::i915_context_engines_load_balance;
using NEO::PrelimI915::i915_context_param_engines;
using NEO::PrelimI915::i915_engine_class_instance;
using NEO::PrelimI915::i915_user_extension;
using NEO::PrelimI915::prelim_drm_i915_debug_engine_info;
using NEO::PrelimI915::prelim_drm_i915_debug_eu_control;
using NEO::PrelimI915::prelim_drm_i915_debug_event;
using NEO::PrelimI915::prelim_drm_i915_debug_event_ack;
using NEO::PrelimI915::prelim_drm_i915_debug_event_client;
using NEO::PrelimI915::prelim_drm_i915_debug_event_context;
using NEO::PrelimI915::prelim_drm_i915_debug_event_context_param;
using NEO::PrelimI915::prelim_drm_i915_debug_event_engines;
using NEO::PrelimI915::prelim_drm_i915_debug_event_eu_attention;
using NEO::PrelimI915::prelim_drm_i915_debug_event_uuid;
using NEO::PrelimI915::prelim_drm_i915_debug_event_vm;
using NEO::PrelimI915::prelim_drm_i915_debug_event_vm_bind;
using NEO::PrelimI915::prelim_drm_i915_debug_read_uuid;
using NEO::PrelimI915::prelim_drm_i915_debug_vm_open;
using NEO::PrelimI915::prelim_drm_i915_debugger_open_param;
using NEO::PrelimI915::prelim_drm_i915_eu_stall_property_id;
using NEO::PrelimI915::prelim_drm_i915_gem_cache_reserve;
using NEO::PrelimI915::prelim_drm_i915_gem_clos_free;
using NEO::PrelimI915::prelim_drm_i915_gem_clos_reserve;
using NEO::PrelimI915::prelim_drm_i915_gem_context_param_acc;
using NEO::PrelimI915::prelim_drm_i915_gem_create_ext;
using NEO::PrelimI915::prelim_drm_i915_gem_create_ext_setparam;
using NEO::PrelimI915::prelim_drm_i915_gem_create_ext_vm_private;
using NEO::PrelimI915::prelim_drm_i915_gem_engine_class;
using NEO::PrelimI915::prelim_drm_i915_gem_execbuffer_ext_user_fence;
using NEO::PrelimI915::prelim_drm_i915_gem_memory_class;
using NEO::PrelimI915::prelim_drm_i915_gem_memory_class_instance;
using NEO::PrelimI915::prelim_drm_i915_gem_object_param;
using NEO::PrelimI915::prelim_drm_i915_gem_vm_advise;
using NEO::PrelimI915::prelim_drm_i915_gem_vm_bind;
using NEO::PrelimI915::prelim_drm_i915_gem_vm_prefetch;
using NEO::PrelimI915::prelim_drm_i915_gem_vm_region_ext;
using NEO::PrelimI915::prelim_drm_i915_gem_wait_user_fence;
using NEO::PrelimI915::prelim_drm_i915_query_distance_info;
using NEO::PrelimI915::prelim_drm_i915_uuid_control;
using NEO::PrelimI915::prelim_drm_i915_vm_bind_ext_set_pat;
using NEO::PrelimI915::prelim_drm_i915_vm_bind_ext_user_fence;
using NEO::PrelimI915::prelim_drm_i915_vm_bind_ext_uuid;

14
shared/source/os_interface/linux/ioctl_helper.cpp
View File

@@ -186,15 +186,15 @@ unsigned int IoctlHelper::getIoctlRequestValueBase(DrmIoctl ioctlRequest) const
int IoctlHelper::getDrmParamValueBase(DrmParam drmParam) const {
switch (drmParam) {
case DrmParam::EngineClassRender:
return I915_ENGINE_CLASS_RENDER;
return drm_i915_gem_engine_class::I915_ENGINE_CLASS_RENDER;
case DrmParam::EngineClassCopy:
return I915_ENGINE_CLASS_COPY;
return drm_i915_gem_engine_class::I915_ENGINE_CLASS_COPY;
case DrmParam::EngineClassVideo:
return I915_ENGINE_CLASS_VIDEO;
return drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO;
case DrmParam::EngineClassVideoEnhance:
return I915_ENGINE_CLASS_VIDEO_ENHANCE;
return drm_i915_gem_engine_class::I915_ENGINE_CLASS_VIDEO_ENHANCE;
case DrmParam::EngineClassInvalid:
return I915_ENGINE_CLASS_INVALID;
return drm_i915_gem_engine_class::I915_ENGINE_CLASS_INVALID;
case DrmParam::EngineClassInvalidNone:
return I915_ENGINE_CLASS_INVALID_NONE;
case DrmParam::ExecBlt:
@@ -206,9 +206,9 @@ int IoctlHelper::getDrmParamValueBase(DrmParam drmParam) const {
case DrmParam::ExecRender:
return I915_EXEC_RENDER;
case DrmParam::MemoryClassDevice:
return I915_MEMORY_CLASS_DEVICE;
return drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE;
case DrmParam::MemoryClassSystem:
return I915_MEMORY_CLASS_SYSTEM;
return drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM;
case DrmParam::ParamChipsetId:
return I915_PARAM_CHIPSET_ID;
case DrmParam::ParamRevision:

18
shared/source/os_interface/linux/ioctl_helper_prelim.cpp
View File

@@ -282,7 +282,7 @@ uint32_t IoctlHelperPrelim20::queryDistances(std::vector<QueryItem> &queryItems,
}
Query query{};
query.itemsPtr = reinterpret_cast<__u64>(queryItems.data());
query.itemsPtr = reinterpret_cast<uint64_t>(queryItems.data());
query.numItems = static_cast<uint32_t>(queryItems.size());
auto ret = IoctlHelper::ioctl(DrmIoctl::Query, &query);
for (auto i = 0u; i < i915Distances.size(); i++) {
@@ -297,17 +297,17 @@ std::optional<DrmParam> IoctlHelperPrelim20::getHasPageFaultParamId() {
bool IoctlHelperPrelim20::getEuStallProperties(std::array<uint64_t, 12u> &properties, uint64_t dssBufferSize, uint64_t samplingRate,
uint64_t pollPeriod, uint64_t engineInstance, uint64_t notifyNReports) {
properties[0] = PRELIM_DRM_I915_EU_STALL_PROP_BUF_SZ;
properties[0] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_BUF_SZ;
properties[1] = dssBufferSize;
properties[2] = PRELIM_DRM_I915_EU_STALL_PROP_SAMPLE_RATE;
properties[2] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_SAMPLE_RATE;
properties[3] = samplingRate;
properties[4] = PRELIM_DRM_I915_EU_STALL_PROP_POLL_PERIOD;
properties[4] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_POLL_PERIOD;
properties[5] = pollPeriod;
properties[6] = PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_CLASS;
properties[7] = PRELIM_I915_ENGINE_CLASS_COMPUTE;
properties[8] = PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_INSTANCE;
properties[6] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_CLASS;
properties[7] = prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE;
properties[8] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_ENGINE_INSTANCE;
properties[9] = engineInstance;
properties[10] = PRELIM_DRM_I915_EU_STALL_PROP_EVENT_REPORT_COUNT;
properties[10] = prelim_drm_i915_eu_stall_property_id::PRELIM_DRM_I915_EU_STALL_PROP_EVENT_REPORT_COUNT;
properties[11] = notifyNReports;
return true;
@@ -548,7 +548,7 @@ unsigned int IoctlHelperPrelim20::getIoctlRequestValue(DrmIoctl ioctlRequest) co
int IoctlHelperPrelim20::getDrmParamValue(DrmParam drmParam) const {
switch (drmParam) {
case DrmParam::EngineClassCompute:
return PRELIM_I915_ENGINE_CLASS_COMPUTE;
return prelim_drm_i915_gem_engine_class::PRELIM_I915_ENGINE_CLASS_COMPUTE;
case DrmParam::ParamHasVmBind:
return PRELIM_I915_PARAM_HAS_VM_BIND;
case DrmParam::ParamHasPageFault:

4
shared/source/os_interface/linux/memory_info.cpp
View File

@@ -22,10 +22,10 @@ namespace NEO {
MemoryInfo::MemoryInfo(const RegionContainer &regionInfo)
: drmQueryRegions(regionInfo), systemMemoryRegion(drmQueryRegions[0]) {
UNRECOVERABLE_IF(systemMemoryRegion.region.memoryClass != I915_MEMORY_CLASS_SYSTEM);
UNRECOVERABLE_IF(systemMemoryRegion.region.memoryClass != drm_i915_gem_memory_class::I915_MEMORY_CLASS_SYSTEM);
std::copy_if(drmQueryRegions.begin(), drmQueryRegions.end(), std::back_inserter(localMemoryRegions),
[](const MemoryRegion &memoryRegionInfo) {
return (memoryRegionInfo.region.memoryClass == I915_MEMORY_CLASS_DEVICE);
return (memoryRegionInfo.region.memoryClass == drm_i915_gem_memory_class::I915_MEMORY_CLASS_DEVICE);
});
}