Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feature: add cmake flag to detect Xe drm 

This is a prework for optional integration with Xe driver
https://cgit.freedesktop.org/drm/drm-xe/commit/?h=drm-xe-next

Related-To: NEO-7578
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2023-01-05 15:23:22 +00:00 committed by Compute-Runtime-Automation
parent 9cec84d3d4
commit 35b8fba1d8
8 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2018-2022 Intel Corporation
# Copyright (C) 2018-2023 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
@ -481,6 +481,14 @@ if(UNIX)
set(NEO_ENABLE_i915_PRELIM_DETECTION FALSE)
endif()
message(STATUS "i915 prelim headers detection: ${NEO_ENABLE_i915_PRELIM_DETECTION}")
# drm-xe support
if(NOT ("${BRANCH_TYPE}" STREQUAL ""))
set(NEO_ENABLE_XE_DRM_DETECTION TRUE)
elseif(NOT DEFINED NEO_ENABLE_XE_DRM_DETECTION)
set(NEO_ENABLE_XE_DRM_DETECTION FALSE)
endif()
message(STATUS "Xe drm detection: ${NEO_ENABLE_XE_DRM_DETECTION}")
endif()
if(NOT DEFINED I915_HEADERS_DIR OR I915_HEADERS_DIR STREQUAL "")
get_filename_component(I915_HEADERS_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}uapi" ABSOLUTE)

2
manifests/manifest.yml
View File

@ -27,7 +27,7 @@ components:
branch: master
dest_dir: infra
fetch_tags: true
revision: v4598
revision: v4602
type: git
internal:
branch: master

1
scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec
View File

@ -56,6 +56,7 @@ cd build
-DNEO_BUILD_WITH_OCL=FALSE \
-DNEO_SKIP_UNIT_TESTS=TRUE \
-DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
-DNEO_ENABLE_XE_DRM_DETECTION=TRUE \
-DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
-DL0_INSTALL_UDEV_RULES=1 \
-DUDEV_RULES_DIR=/etc/udev/rules.d/ \

1
scripts/packaging/l0_gpu_driver/sles_15.3/SPECS/l0_gpu_driver.spec
View File

@ -66,6 +66,7 @@ exposing hardware capabilities to applications.
-DNEO_BUILD_WITH_OCL=FALSE \
-DNEO_SKIP_UNIT_TESTS=TRUE \
-DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
-DNEO_ENABLE_XE_DRM_DETECTION=TRUE \
-DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
-DL0_INSTALL_UDEV_RULES=1 \
-DUDEV_RULES_DIR=/etc/udev/rules.d/ \

2
scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules
View File

@ -9,6 +9,7 @@ RELEASE_WITH_REGKEYS ?= FALSE
IGDRCL_FORCE_USE_LIBVA ?= FALSE
NEO_SKIP_UNIT_TESTS ?= FALSE
NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
NEO_ENABLE_XE_DRM_DETECTION ?= TRUE
NEO_FORCE_USE_AUB_STREAM ?= TRUE
override_dh_auto_configure:
@ -17,6 +18,7 @@ override_dh_auto_configure:
-DNEO_VERSION_BUILD=$(ver) \
-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \
-DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \
-DNEO_ENABLE_XE_DRM_DETECTION=${NEO_ENABLE_XE_DRM_DETECTION} \
-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
-DNEO_BUILD_WITH_OCL=FALSE \
-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \

1
scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
View File

@ -62,6 +62,7 @@ cd build
-DBUILD_WITH_L0=FALSE \
-DNEO_SKIP_UNIT_TESTS=TRUE \
-DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
-DNEO_ENABLE_XE_DRM_DETECTION=TRUE \
-DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
-DCMAKE_VERBOSE_MAKEFILE=FALSE \
-DI915_HEADERS_DIR=$(realpath %{I915_HEADERS_DIR})

1
scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec
View File

@ -70,6 +70,7 @@ Summary: ocloc package for opencl
-DBUILD_WITH_L0=FALSE \
-DNEO_SKIP_UNIT_TESTS=TRUE \
-DNEO_ENABLE_i915_PRELIM_DETECTION=TRUE \
-DNEO_ENABLE_XE_DRM_DETECTION=TRUE \
-DRELEASE_WITH_REGKEYS=%{NEO_RELEASE_WITH_REGKEYS} \
-DCMAKE_VERBOSE_MAKEFILE=FALSE \
-DI915_HEADERS_DIR=$(realpath %{I915_HEADERS_DIR})

2
scripts/packaging/opencl/ubuntu_20.04/debian/rules
View File

@ -8,6 +8,7 @@ RELEASE_WITH_REGKEYS ?= FALSE
IGDRCL_FORCE_USE_LIBVA ?= FALSE
NEO_SKIP_UNIT_TESTS ?= FALSE
NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
NEO_ENABLE_XE_DRM_DETECTION ?= TRUE
NEO_FORCE_USE_AUB_STREAM ?= TRUE
override_dh_auto_configure:
@ -19,6 +20,7 @@ override_dh_auto_configure:
-DDO_NOT_RUN_AUB_TESTS=${DO_NOT_RUN_AUB_TESTS} \
-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \
-DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \
-DNEO_ENABLE_XE_DRM_DETECTION=${NEO_ENABLE_XE_DRM_DETECTION} \
-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
-DBUILD_WITH_L0=FALSE \
-DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \