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@xxxxxxxxx>
---
lib/igt_gt.c | 12 ++++--------
lib/igt_gt.h | 2 +-
tests/gem_concurrent_blit.c | 2 +-
tests/gem_pread_after_blit.c | 2 +-
tests/gem_reloc_vs_gpu.c | 8 +++-----
5 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index 526cbee03308..c003a7ca30f0 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -29,16 +29,12 @@
#include "igt_debugfs.h"
#include "ioctl_wrappers.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))
- return 0;
-
- if (gen < 5) /* safe resets */
- return 0;
-
- return 1;
+ igt_require(gem_context_has_param(fd, LOCAL_CONTEXT_PARAM_BAN_PERIOD));
+ igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5);
}
struct igt_hang_ring igt_hang_ring(int fd, int gen, int ring)
diff --git a/lib/igt_gt.h b/lib/igt_gt.h
index 19bbcef2a91e..1ed78837cf5b 100644
--- a/lib/igt_gt.h
+++ b/lib/igt_gt.h
@@ -24,7 +24,7 @@
#ifndef 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 {
unsigned handle;
diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c
index 726198012c14..245ad4581783 100644
--- a/tests/gem_concurrent_blit.c
+++ b/tests/gem_concurrent_blit.c
@@ -474,7 +474,7 @@ static struct igt_hang_ring rcs_hang(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,
diff --git a/tests/gem_pread_after_blit.c b/tests/gem_pread_after_blit.c
index c09c8dc49ee0..6e4bd6257feb 100644
--- a/tests/gem_pread_after_blit.c
+++ b/tests/gem_pread_after_blit.c
@@ -239,7 +239,7 @@ igt_main
igt_stop_signal_helper();
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);
}
}
diff --git a/tests/gem_reloc_vs_gpu.c b/tests/gem_reloc_vs_gpu.c
index bb8615b6a593..68bd17d3ae5b 100644
--- a/tests/gem_reloc_vs_gpu.c
+++ b/tests/gem_reloc_vs_gpu.c
@@ -263,9 +263,7 @@ static void do_forked_test(int fd, unsigned flags)
struct igt_helper_process thrasher = {};
if (flags & HANG)
- igt_require(igt_can_hang_ring(fd,
- intel_gen(devid),
- I915_EXEC_BLT));
+ igt_require_hang_ring(fd, I915_EXEC_BLT);
if (flags & (THRASH | THRASH_INACTIVE)) {
uint64_t val = (flags & THRASH_INACTIVE) ?
@@ -328,7 +326,7 @@ igt_main
do_test(fd, false, no_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);
}
@@ -336,7 +334,7 @@ igt_main
do_test(fd, true, no_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);
}
igt_stop_signal_helper();
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
