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

lib/gt: api polish for igt_can_hang_ring

Browse Source 
Align with common igt library style:
- Push the igt_require into the function.
- Push the intel_gen into the function.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter 2015-02-06 10:49:20 +01:00
parent 9ca2cc12b4
commit c66b2425e7
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/igt_gt.c
View File

@ -29,16 +29,12 @@
#include "igt_debugfs.h" #include "igt_debugfs.h"
#include "ioctl_wrappers.h" #include "ioctl_wrappers.h"
#include "intel_reg.h" #include "intel_reg.h"
#include "intel_chipset.h"
int igt_can_hang_ring(int fd, int gen, int ring) void igt_require_hang_ring(int fd, int ring)
{ {
if (!gem_context_has_param(fd, LOCAL_CONTEXT_PARAM_BAN_PERIOD)) igt_require(gem_context_has_param(fd, LOCAL_CONTEXT_PARAM_BAN_PERIOD));
return 0; igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5);
if (gen < 5) /* safe resets */
return 0;
return 1;
} }
struct igt_hang_ring igt_hang_ring(int fd, int gen, int ring) struct igt_hang_ring igt_hang_ring(int fd, int gen, int ring)

2
lib/igt_gt.h
View File

@ -24,7 +24,7 @@
#ifndef IGT_GT_H #ifndef IGT_GT_H
#define IGT_GT_H #define IGT_GT_H
int igt_can_hang_ring(int fd, int gen, int ring); void igt_require_hang_ring(int fd, int ring);
struct igt_hang_ring { struct igt_hang_ring {
unsigned handle; unsigned handle;

2
tests/gem_concurrent_blit.c
View File

@ -474,7 +474,7 @@ static struct igt_hang_ring rcs_hang(void)
static void hang_require(void) static void hang_require(void)
{ {
igt_require(igt_can_hang_ring(fd, gen, -1)); igt_require_hang_ring(fd, -1);
} }
static void do_overwrite_source(const struct access_mode *mode, static void do_overwrite_source(const struct access_mode *mode,

2
tests/gem_pread_after_blit.c
View File

@ -239,7 +239,7 @@ igt_main
igt_stop_signal_helper(); igt_stop_signal_helper();
igt_subtest_f("%s-hang", t->name) { igt_subtest_f("%s-hang", t->name) {
igt_require(igt_can_hang_ring(fd, batch->gen, -1)); igt_require_hang_ring(fd, -1);
do_test(fd, t->cache, src, start, dst, 1, bcs_hang); do_test(fd, t->cache, src, start, dst, 1, bcs_hang);
} }
} }

8
tests/gem_reloc_vs_gpu.c
View File

@ -263,9 +263,7 @@ static void do_forked_test(int fd, unsigned flags)
struct igt_helper_process thrasher = {}; struct igt_helper_process thrasher = {};
if (flags & HANG) if (flags & HANG)
igt_require(igt_can_hang_ring(fd, igt_require_hang_ring(fd, I915_EXEC_BLT);
intel_gen(devid),
I915_EXEC_BLT));
if (flags & (THRASH | THRASH_INACTIVE)) { if (flags & (THRASH | THRASH_INACTIVE)) {
uint64_t val = (flags & THRASH_INACTIVE) ? uint64_t val = (flags & THRASH_INACTIVE) ?
@ -328,7 +326,7 @@ igt_main
do_test(fd, false, no_hang); do_test(fd, false, no_hang);
igt_subtest("interruptible-hang") { igt_subtest("interruptible-hang") {
igt_require(igt_can_hang_ring(fd, intel_gen(devid), I915_EXEC_BLT)); igt_require_hang_ring(fd, I915_EXEC_BLT);
do_test(fd, false, bcs_hang); do_test(fd, false, bcs_hang);
} }
@ -336,7 +334,7 @@ igt_main
do_test(fd, true, no_hang); do_test(fd, true, no_hang);
igt_subtest("faulting-reloc-interruptible-hang") { igt_subtest("faulting-reloc-interruptible-hang") {
igt_require(igt_can_hang_ring(fd, intel_gen(devid), I915_EXEC_BLT)); igt_require_hang_ring(fd, I915_EXEC_BLT);
do_test(fd, true, bcs_hang); do_test(fd, true, bcs_hang);
} }
igt_stop_signal_helper(); igt_stop_signal_helper();