From d636e772c0c9f3b4147a2684ebd6a603f77e3caf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Thu, 9 Feb 2023 09:57:56 -0800 Subject: [PATCH] intel/common: Implement the Xe functions for intel_gem MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: José Roberto de Souza Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/common/intel_gem.c | 8 +++++++ src/intel/common/meson.build | 2 ++ src/intel/common/xe/intel_gem.c | 50 +++++++++++++++++++++++++++++++++++++++++ src/intel/common/xe/intel_gem.h | 30 +++++++++++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 src/intel/common/xe/intel_gem.c create mode 100644 src/intel/common/xe/intel_gem.h diff --git a/src/intel/common/intel_gem.c b/src/intel/common/intel_gem.c index c79bb42..bd07ff5 100644 --- a/src/intel/common/intel_gem.c +++ b/src/intel/common/intel_gem.c @@ -25,6 +25,7 @@ #include "i915/intel_engine.h" #include "i915/intel_gem.h" +#include "xe/intel_gem.h" bool intel_gem_supports_syncobj_wait(int fd) @@ -103,6 +104,8 @@ intel_gem_read_render_timestamp(int fd, switch (kmd_type) { case INTEL_KMD_TYPE_I915: return i915_gem_read_render_timestamp(fd, value); + case INTEL_KMD_TYPE_XE: + return xe_gem_read_render_timestamp(fd, value); default: unreachable("Missing"); return false; @@ -122,6 +125,9 @@ intel_gem_supports_protected_context(int fd, enum intel_kmd_type kmd_type) switch (kmd_type) { case INTEL_KMD_TYPE_I915: return i915_gem_supports_protected_context(fd); + case INTEL_KMD_TYPE_XE: + /* TODO: so far Xe don't have support for protected contexts/engines */ + return false; default: unreachable("Missing"); return false; @@ -140,6 +146,8 @@ intel_gem_can_render_on_fd(int fd, enum intel_kmd_type kmd_type) switch (kmd_type) { case INTEL_KMD_TYPE_I915: return i915_gem_can_render_on_fd(fd); + case INTEL_KMD_TYPE_XE: + return xe_gem_can_render_on_fd(fd); default: unreachable("Missing"); return false; diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build index 5dfa61c..0537de3 100644 --- a/src/intel/common/meson.build +++ b/src/intel/common/meson.build @@ -25,6 +25,8 @@ files_libintel_common = files( 'i915/intel_gem.h', 'xe/intel_engine.c', 'xe/intel_engine.h', + 'xe/intel_gem.c', + 'xe/intel_gem.h', 'intel_aux_map.c', 'intel_aux_map.h', 'intel_buffer_alloc.h', diff --git a/src/intel/common/xe/intel_gem.c b/src/intel/common/xe/intel_gem.c new file mode 100644 index 0000000..b9e9fa7 --- /dev/null +++ b/src/intel/common/xe/intel_gem.c @@ -0,0 +1,50 @@ +/* + * Copyright © 2023 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +#include "xe/intel_gem.h" + +#include "common/intel_gem.h" + +#include "drm-uapi/xe_drm.h" + +bool +xe_gem_read_render_timestamp(int fd, uint64_t *value) +{ + struct drm_xe_mmio mmio = { + .addr = RCS_TIMESTAMP, + .flags = DRM_XE_MMIO_READ | DRM_XE_MMIO_64BIT, + }; + if (intel_ioctl(fd, DRM_IOCTL_XE_MMIO, &mmio)) + return false; + + *value = mmio.value; + return true; +} + +bool +xe_gem_can_render_on_fd(int fd) +{ + struct drm_xe_device_query query = { + .query = DRM_XE_DEVICE_QUERY_ENGINES, + }; + return intel_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query) == 0; +} diff --git a/src/intel/common/xe/intel_gem.h b/src/intel/common/xe/intel_gem.h new file mode 100644 index 0000000..364b1bc --- /dev/null +++ b/src/intel/common/xe/intel_gem.h @@ -0,0 +1,30 @@ +/* + * Copyright © 2023 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#pragma once + +#include +#include + +bool xe_gem_read_render_timestamp(int fd, uint64_t *value); +bool xe_gem_can_render_on_fd(int fd); -- 2.7.4