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

igt/kms_flip: Convert over to real hang injection

Browse Source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-12-11 21:32:32 +00:00
parent 7f05d31c39
commit 1ba9717e6e
1 changed files with 15 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
tests/kms_flip.c
View File

@ -776,72 +776,17 @@ static void set_y_tiling(struct test_output *o, int fb_idx)
drmFree(r); drmFree(r);
} }
static void stop_rings(bool stop) static igt_hang_ring_t hang_gpu(int fd)
{ {
if (stop) return igt_hang_ring(fd, I915_EXEC_DEFAULT);
igt_set_stop_rings(STOP_RING_DEFAULTS);
else
igt_set_stop_rings(STOP_RING_NONE);
} }
static void eat_error_state(void) static void unhang_gpu(int fd, igt_hang_ring_t hang)
{ {
static const char dfs_entry_error[] = "i915_error_state"; igt_post_hang_ring(fd, hang);
static const char data[] = "";
int fd;
fd = igt_debugfs_open(dfs_entry_error, O_WRONLY);
igt_assert_lte(0, fd);
igt_assert(write(fd, data, sizeof(data)) == sizeof(data));
close(fd);
/* and check whether stop_rings is not reset, i.e. the hang has indeed
* happened */
igt_assert_f(igt_get_stop_rings() == STOP_RING_NONE,
"no gpu hang detected, stop_rings is still 0x%x\n",
igt_get_stop_rings());
close(fd);
} }
static void unhang_gpu(int fd, uint32_t handle) static bool is_wedged(int fd)
{
gem_sync(drm_fd, handle);
gem_close(drm_fd, handle);
eat_error_state();
stop_rings(false);
}
static uint32_t hang_gpu(int fd)
{
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 gem_exec;
uint32_t b[2] = {MI_BATCH_BUFFER_END};
stop_rings(true);
memset(&gem_exec, 0, sizeof(gem_exec));
gem_exec.handle = gem_create(fd, 4096);
gem_write(fd, gem_exec.handle, 0, b, sizeof(b));
memset(&execbuf, 0, sizeof(execbuf));
execbuf.buffers_ptr = (uintptr_t)&gem_exec;
execbuf.buffer_count = 1;
execbuf.batch_len = sizeof(b);
if (drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf)) {
igt_assert_f(errno == EIO,
"failed to exercise page flip hang recovery\n");
unhang_gpu(fd, gem_exec.handle);
gem_exec.handle = 0;
}
return gem_exec.handle;
}
static bool is_hung(int fd)
{ {
if (drmIoctl(fd, DRM_IOCTL_I915_GEM_THROTTLE, 0) == 0) if (drmIoctl(fd, DRM_IOCTL_I915_GEM_THROTTLE, 0) == 0)
return false; return false;
@ -883,7 +828,7 @@ static unsigned int run_test_step(struct test_output *o)
bool do_vblank; bool do_vblank;
struct vblank_reply vbl_reply; struct vblank_reply vbl_reply;
unsigned int target_seq; unsigned int target_seq;
uint32_t hang = 0; /* Suppress GCC warning */ igt_hang_ring_t hang;
target_seq = o->vblank_state.seq_step; target_seq = o->vblank_state.seq_step;
/* Absolute waits only works once we have a frame counter. */ /* Absolute waits only works once we have a frame counter. */
@ -989,10 +934,9 @@ static unsigned int run_test_step(struct test_output *o)
igt_print_activity(); igt_print_activity();
if (do_flip && (o->flags & TEST_HANG)) { memset(&hang, 0, sizeof(hang));
if (do_flip && (o->flags & TEST_HANG))
hang = hang_gpu(drm_fd); hang = hang_gpu(drm_fd);
igt_assert_f(hang, "failed to exercise page flip hang recovery\n");
}
/* try to make sure we can issue two flips during the same frame */ /* try to make sure we can issue two flips during the same frame */
if (do_flip && (o->flags & TEST_EBUSY)) { if (do_flip && (o->flags & TEST_EBUSY)) {
@ -1064,7 +1008,6 @@ static unsigned int run_test_step(struct test_output *o)
if (do_flip && (o->flags & TEST_EINVAL) && !(o->flags & TEST_FB_BAD_TILING)) if (do_flip && (o->flags & TEST_EINVAL) && !(o->flags & TEST_FB_BAD_TILING))
igt_assert(do_page_flip(o, new_fb_id, true) == expected_einval); igt_assert(do_page_flip(o, new_fb_id, true) == expected_einval);
if (hang)
unhang_gpu(drm_fd, hang); unhang_gpu(drm_fd, hang);
return completed_events; return completed_events;
@ -1295,13 +1238,12 @@ static unsigned int wait_for_events(struct test_output *o)
static unsigned event_loop(struct test_output *o, unsigned duration_ms) static unsigned event_loop(struct test_output *o, unsigned duration_ms)
{ {
unsigned long start, end; unsigned long start, end;
uint32_t hang = 0; /* Suppress GCC warning */ igt_hang_ring_t hang;
int count = 0; int count = 0;
if (o->flags & TEST_HANG_ONCE) { memset(&hang, 0, sizeof(hang));
if (o->flags & TEST_HANG_ONCE)
hang = hang_gpu(drm_fd); hang = hang_gpu(drm_fd);
igt_assert_f(hang, "failed to exercise page flip hang recovery\n");
}
start = gettime_us(); start = gettime_us();
@ -1322,7 +1264,6 @@ static unsigned event_loop(struct test_output *o, unsigned duration_ms)
end = gettime_us(); end = gettime_us();
if (hang)
unhang_gpu(drm_fd, hang); unhang_gpu(drm_fd, hang);
/* Flush any remaining events */ /* Flush any remaining events */
@ -1488,7 +1429,7 @@ static int run_test(int duration, int flags)
struct test_output o; struct test_output o;
int i, n, modes = 0; int i, n, modes = 0;
igt_require((flags & TEST_HANG) == 0 || !is_hung(drm_fd)); igt_require((flags & TEST_HANG) == 0 || !is_wedged(drm_fd));
if (flags & TEST_RPM) if (flags & TEST_RPM)
igt_require(igt_setup_runtime_pm()); igt_require(igt_setup_runtime_pm());
@ -1548,7 +1489,7 @@ static int run_pair(int duration, int flags)
struct test_output o; struct test_output o;
int i, j, m, n, modes = 0; int i, j, m, n, modes = 0;
igt_require((flags & TEST_HANG) == 0 || !is_hung(drm_fd)); igt_require((flags & TEST_HANG) == 0 || !is_wedged(drm_fd));
resources = drmModeGetResources(drm_fd); resources = drmModeGetResources(drm_fd);
igt_assert(resources); igt_assert(resources);