diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-25 15:19:44 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-26 19:03:25 +0100 |
| commit | 6fbb9508c3ce339d36fafa1b8bcdb9ce66905953 (patch) | |
| tree | 2c812ab9e806baccd4fd7700a26c0e49c7731fd8 /tests/i915/gem_exec_params.c | |
| parent | 69d00d9daf9645cd6cd6751e78a4111646bf1284 (diff) | |
lib/i915: Use explicit iterator names in for_each_engine()
Provide the iterator name as an explicit macro parameter so that it is
known to the caller, and allows for them to properly nest loops over all
engines.
Fixes:
../tests/i915/gem_exec_schedule.c: In function ‘semaphore_noskip’:
../lib/igt_gt.h:84:44: warning: declaration of ‘e__’ shadows a previous local [-Wshadow]
for (const struct intel_execution_engine *e__ = intel_execution_engines;\
^~~
../tests/i915/gem_exec_schedule.c:653:2: note: in expansion of macro ‘for_each_physical_engine’
for_each_physical_engine(i915, other) {
^~~~~~~~~~~~~~~~~~~~~~~~
../lib/igt_gt.h:84:44: note: shadowed declaration is here
for (const struct intel_execution_engine *e__ = intel_execution_engines;\
^~~
../tests/i915/gem_exec_schedule.c:652:2: note: in expansion of macro ‘for_each_physical_engine’
for_each_physical_engine(i915, engine) {
^~~~~~~~~~~~~~~~~~~~~~~~
../tests/i915/gem_exec_schedule.c: In function ‘measure_semaphore_power’:
../lib/igt_gt.h:84:44: warning: declaration of ‘e__’ shadows a previous local [-Wshadow]
for (const struct intel_execution_engine *e__ = intel_execution_engines;\
^~~
../tests/i915/gem_exec_schedule.c:1740:3: note: in expansion of macro ‘for_each_physical_engine’
for_each_physical_engine(i915, engine) {
^~~~~~~~~~~~~~~~~~~~~~~~
../lib/igt_gt.h:84:44: note: shadowed declaration is here
for (const struct intel_execution_engine *e__ = intel_execution_engines;\
^~~
../tests/i915/gem_exec_schedule.c:1719:2: note: in expansion of macro ‘for_each_physical_engine’
for_each_physical_engine(i915, signaler) {
^~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Diffstat (limited to 'tests/i915/gem_exec_params.c')
| -rw-r--r-- | tests/i915/gem_exec_params.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c index 49c56a8d..8f15e645 100644 --- a/tests/i915/gem_exec_params.c +++ b/tests/i915/gem_exec_params.c @@ -236,8 +236,8 @@ igt_main igt_subtest("control") { for (e = intel_execution_engines; e->name; e++) { - if (has_ring(fd, e->exec_id | e->flags)) { - execbuf.flags = e->exec_id | e->flags; + if (has_ring(fd, eb_ring(e))) { + execbuf.flags = eb_ring(e); gem_execbuf(fd, &execbuf); } } @@ -387,14 +387,16 @@ igt_main igt_subtest("rs-invalid") { bool has_rs = has_resource_streamer(fd); - unsigned int engine; - for_each_engine(fd, engine) { + for_each_engine(it, fd) { int expect = -EINVAL; - if (has_rs && (engine == 0 || engine == I915_EXEC_RENDER)) + if (has_rs && + (eb_ring(it) == 0 || + eb_ring(it) == I915_EXEC_RENDER)) expect = 0; - execbuf.flags = engine | LOCAL_I915_EXEC_RESOURCE_STREAMER; + execbuf.flags = + eb_ring(it) | LOCAL_I915_EXEC_RESOURCE_STREAMER; igt_assert_eq(__gem_execbuf(fd, &execbuf), expect); } } |