diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-04-17 07:30:41 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-04-17 09:03:08 +0100 |
commit | 77f5e8465110cb67d2d8272123907ea1c4725631 (patch) | |
tree | 39e2fe708285200aad273377055423f820c4ccac /tests/i915 | |
parent | a2fd0489c87a4d647c339f98057e6a1550e0e2f5 (diff) |
i915: Update i915_drm.h
Copy uapi/i915_drm.h across from
kernel commit d1172ab3d443e84ade75285f8c107bfac7e386d8
Author: Chris Wilson <chris@chris-wilson.co.uk>
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 <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'tests/i915')
-rw-r--r-- | tests/i915/gem_ctx_sseu.c | 26 |
1 files changed, 13 insertions, 13 deletions
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); |