[igt-dev] [PATCH i-g-t v4 1/2] i915_drm.h sync uapi engine class enum with drm-next

Adrian Larumbe adrian.larumbe at collabora.com
Thu Sep 1 16:59:20 UTC 2022


gem_ctx_isolation at preservation needs to take into account the shared reset
domain between RCS and CCS engines.

Remove local compute engine definition as it was already synchronised into
include/drm-uapi/i915_drm.h from the kernel sources in a past commit.

Signed-Off-By: Adrian Larumbe <adrian.larumbe at collabora.com>
---
 lib/i915/i915_drm_local.h      | 2 --
 tests/i915/gem_ctx_isolation.c | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/i915/i915_drm_local.h b/lib/i915/i915_drm_local.h
index ac35abf6af76..696e5aa05048 100644
--- a/lib/i915/i915_drm_local.h
+++ b/lib/i915/i915_drm_local.h
@@ -19,8 +19,6 @@ extern "C" {
  * or local_ prefix and without any #ifndef's. Attempt should be made to
  * clean these up when kernel uapi headers are sync'd.
  */
-#define I915_ENGINE_CLASS_COMPUTE 4
-
 #define DRM_I915_QUERY_GEOMETRY_SUBSLICES      6
 
 /*
diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
index 95d13969fa61..4233ea5784dc 100644
--- a/tests/i915/gem_ctx_isolation.c
+++ b/tests/i915/gem_ctx_isolation.c
@@ -164,6 +164,8 @@ static const struct named_register {
 
 	{ "xCS_GPR", GEN9, ALL, 0x600, 32, .relative = true },
 
+        /* TODO: add CCS0 registers */
+
 	{}
 }, ignore_registers[] = {
 	{ "RCS timestamp", GEN6, ~0u, 0x2358 },
-- 
2.37.0



More information about the igt-dev mailing list