From 77f5e8465110cb67d2d8272123907ea1c4725631 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 17 Apr 2019 07:30:41 +0100 Subject: i915: Update i915_drm.h Copy uapi/i915_drm.h across from kernel commit d1172ab3d443e84ade75285f8c107bfac7e386d8 Author: Chris Wilson Date: Fri Apr 12 08:14:16 2019 +0100 drm/i915: Introduce struct class_instance for engines across the uAPI and adapt gem_ctx_sseu to match the new struct. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviewed-by: Tvrtko Ursulin --- tests/i915/gem_ctx_sseu.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/i915/gem_ctx_sseu.c b/tests/i915/gem_ctx_sseu.c index 3afa5c15..48e4411c 100644 --- a/tests/i915/gem_ctx_sseu.c +++ b/tests/i915/gem_ctx_sseu.c @@ -144,23 +144,23 @@ static void test_engines(int fd) /* get_param */ - sseu.engine_instance = -1; /* Assumed invalid. */ + sseu.engine.engine_instance = -1; /* Assumed invalid. */ igt_assert_eq(__gem_context_get_param(fd, &arg), -EINVAL); - sseu.engine_class = I915_ENGINE_CLASS_INVALID; /* Both invalid. */ + sseu.engine.engine_class = I915_ENGINE_CLASS_INVALID; /* Both invalid. */ igt_assert_eq(__gem_context_get_param(fd, &arg), -EINVAL); - sseu.engine_instance = 0; /* Class invalid. */ + sseu.engine.engine_instance = 0; /* Class invalid. */ igt_assert_eq(__gem_context_get_param(fd, &arg), -EINVAL); - sseu.engine_class = I915_ENGINE_CLASS_RENDER; + sseu.engine.engine_class = I915_ENGINE_CLASS_RENDER; last_with_engines = -1; for (class = 0; class < ~0; class++) { for (instance = 0; instance < ~0; instance++) { int ret; - sseu.engine_class = class; - sseu.engine_instance = instance; + sseu.engine.engine_class = class; + sseu.engine.engine_instance = instance; ret = __gem_context_get_param(fd, &arg); @@ -182,19 +182,19 @@ static void test_engines(int fd) * Get some proper values before trying to reprogram them onto * an invalid engine. */ - sseu.engine_class = 0; - sseu.engine_instance = 0; + sseu.engine.engine_class = 0; + sseu.engine.engine_instance = 0; gem_context_get_param(fd, &arg); /* set_param */ - sseu.engine_instance = -1; /* Assumed invalid. */ + sseu.engine.engine_instance = -1; /* Assumed invalid. */ igt_assert_eq(__gem_context_set_param(fd, &arg), -EINVAL); - sseu.engine_class = I915_ENGINE_CLASS_INVALID; /* Both invalid. */ + sseu.engine.engine_class = I915_ENGINE_CLASS_INVALID; /* Both invalid. */ igt_assert_eq(__gem_context_set_param(fd, &arg), -EINVAL); - sseu.engine_instance = 0; /* Class invalid. */ + sseu.engine.engine_instance = 0; /* Class invalid. */ igt_assert_eq(__gem_context_set_param(fd, &arg), -EINVAL); last_with_engines = -1; @@ -202,8 +202,8 @@ static void test_engines(int fd) for (instance = 0; instance < ~0; instance++) { int ret; - sseu.engine_class = class; - sseu.engine_instance = instance; + sseu.engine.engine_class = class; + sseu.engine.engine_instance = instance; ret = __gem_context_set_param(fd, &arg); -- cgit v1.2.3