flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-08 00:16:18 +00:00
Code Issues Releases Wiki Activity

igt/gem_ringfill: Use common array of rings

Browse Source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-01-27 14:17:53 +00:00
parent 8cd5289334
commit dd6b45235b
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/gem_ringfill.c
View File

@ -90,6 +90,7 @@ static void run_test(int fd, unsigned ring, unsigned flags)
igt_skip_on_f(gen == 6 && (ring & ~(3<<13)) == I915_EXEC_BSD, igt_skip_on_f(gen == 6 && (ring & ~(3<<13)) == I915_EXEC_BSD,
"MI_STORE_DATA broken on gen6 bsd\n"); "MI_STORE_DATA broken on gen6 bsd\n");
gem_require_ring(fd, ring);
gem_quiescent_gpu(fd); gem_quiescent_gpu(fd);
@ -200,19 +201,7 @@ igt_main
{ "", "-bomb", BOMB | INTERRUPTIBLE }, { "", "-bomb", BOMB | INTERRUPTIBLE },
{ NULL, NULL, 0 } { NULL, NULL, 0 }
}, *mode; }, *mode;
const struct { const struct intel_execution_engine *e;
const char *name;
unsigned int flags;
} rings[] = {
{ "default", I915_EXEC_DEFAULT },
{ "rcs", I915_EXEC_RENDER },
{ "bcs", I915_EXEC_BLT },
{ "bsd", I915_EXEC_BSD },
{ "bsd1", I915_EXEC_BSD | 1 << 13 },
{ "bsd2", I915_EXEC_BSD | 2 << 13 },
{ "vebox", I915_EXEC_VEBOX },
{ NULL, 0 }
}, *ring;
int fd; int fd;
igt_skip_on_simulation(); igt_skip_on_simulation();
@ -221,12 +210,12 @@ igt_main
fd = drm_open_driver_master(DRIVER_INTEL); fd = drm_open_driver_master(DRIVER_INTEL);
for (mode = modes; mode->prefix; mode++) { for (mode = modes; mode->prefix; mode++) {
for (ring = rings; ring->name; ring++) { for (e = intel_execution_engines; e->name; e++) {
igt_subtest_f("%s%s%s", igt_subtest_f("%s%s%s",
ring->flags || mode->flags ? "" : mode->prefix, e->exec_id || mode->flags ? "" : mode->prefix,
ring->name, e->name,
mode->suffix) mode->suffix)
run_test(fd, ring->flags, mode->flags); run_test(fd, e->exec_id | e->flags, mode->flags);
} }
} }