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

tests/gem_write_read_ring_switch: use igt_exit and friends

Browse Source 
And consolidate the gem_require_ring check a bit.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2013-08-14 12:07:44 +02:00
parent 99431a4f06
commit c2d6773b25
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/gem_write_read_ring_switch.c
View File

@ -42,7 +42,6 @@
#include "i830_reg.h" #include "i830_reg.h"
#define LOCAL_I915_EXEC_VEBOX (4<<0) #define LOCAL_I915_EXEC_VEBOX (4<<0)
bool skipped_all = true;
static drm_intel_bufmgr *bufmgr; static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch; struct intel_batchbuffer *batch;
@ -62,7 +61,10 @@ static void run_test(int ring, const char *testname)
uint32_t *ptr; uint32_t *ptr;
int i; int i;
skipped_all = false; gem_require_ring(fd, ring);
/* Testing render only makes sense with separate blt. */
if (ring == I915_EXEC_RENDER)
gem_require_ring(fd, I915_EXEC_BLT);
printf("running subtest %s\n", testname); printf("running subtest %s\n", testname);
@ -191,26 +193,16 @@ int main(int argc, char **argv)
} }
for (i = 0; i < ARRAY_SIZE(tests); i++) { for (i = 0; i < ARRAY_SIZE(tests); i++) {
igt_subtest(tests[i].name) { igt_subtest(tests[i].name)
gem_require_ring(fd, tests[i].ring);
/* Testing render only makes sense with separate blt. */
if (tests[i].ring == I915_EXEC_RENDER)
gem_require_ring(fd, I915_EXEC_BLT);
run_test(tests[i].ring, tests[i].name); run_test(tests[i].ring, tests[i].name);
}
} }
igt_fork_signal_helper(); igt_fork_signal_helper();
for (i = 0; i < ARRAY_SIZE(tests); i++) { for (i = 0; i < ARRAY_SIZE(tests); i++) {
char name[180]; char name[180];
snprintf(name, sizeof(name), "%s-interruptible", tests[i].name); snprintf(name, sizeof(name), "%s-interruptible", tests[i].name);
igt_subtest(name) { igt_subtest(name)
gem_require_ring(fd, tests[i].ring);
/* Testing render only makes sense with separate blt. */
if (tests[i].ring == I915_EXEC_RENDER)
gem_require_ring(fd, I915_EXEC_BLT);
run_test(tests[i].ring, name); run_test(tests[i].ring, name);
}
} }
igt_stop_signal_helper(); igt_stop_signal_helper();
@ -218,5 +210,5 @@ int main(int argc, char **argv)
close(fd); close(fd);
return skipped_all ? 77 : 0; igt_exit();
} }