diff options
| author | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-04-21 16:51:29 +0200 |
|---|---|---|
| committer | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-08-10 21:02:50 +0200 |
| commit | c3334af1f7b798326b0bcfa7ba31db0dd4398448 (patch) | |
| tree | 4167b701431db4fb550d3befbcec3eac2e63a5df /lib/igt_gt.c | |
| parent | 19c37851f0778e0670dd3e3f093e88413da397be (diff) | |
lib/igt_gt: Add passing ahnd as an argument to igt_hang
Required as spinner is used, see gem_ringfill.c
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Diffstat (limited to 'lib/igt_gt.c')
| -rw-r--r-- | lib/igt_gt.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/lib/igt_gt.c b/lib/igt_gt.c index c049477d..a0ba04cc 100644 --- a/lib/igt_gt.c +++ b/lib/igt_gt.c @@ -269,7 +269,8 @@ static bool has_ctx_exec(int fd, unsigned ring, uint32_t ctx) * Returns: * Structure with helper internal state for igt_post_hang_ring(). */ -igt_hang_t igt_hang_ctx(int fd, uint32_t ctx, int ring, unsigned flags) +static igt_hang_t __igt_hang_ctx(int fd, uint64_t ahnd, uint32_t ctx, int ring, + unsigned flags) { struct drm_i915_gem_context_param param; igt_spin_t *spin; @@ -298,6 +299,7 @@ igt_hang_t igt_hang_ctx(int fd, uint32_t ctx, int ring, unsigned flags) context_set_ban(fd, ctx, 0); spin = __igt_spin_new(fd, + .ahnd = ahnd, .ctx_id = ctx, .engine = ring, .flags = IGT_SPIN_NO_PREEMPTION); @@ -305,6 +307,17 @@ igt_hang_t igt_hang_ctx(int fd, uint32_t ctx, int ring, unsigned flags) return (igt_hang_t){ spin, ctx, ban, flags }; } +igt_hang_t igt_hang_ctx(int fd, uint32_t ctx, int ring, unsigned flags) +{ + return __igt_hang_ctx(fd, 0, ctx, ring, flags); +} + +igt_hang_t igt_hang_ctx_with_ahnd(int fd, uint64_t ahnd, uint32_t ctx, int ring, + unsigned flags) +{ + return __igt_hang_ctx(fd, ahnd, ctx, ring, flags); +} + /** * igt_hang_ring: * @fd: open i915 drm file descriptor @@ -322,6 +335,12 @@ igt_hang_t igt_hang_ring(int fd, int ring) return igt_hang_ctx(fd, 0, ring, 0); } +igt_hang_t igt_hang_ring_with_ahnd(int fd, int ring, uint64_t ahnd) +{ + return igt_hang_ctx_with_ahnd(fd, ahnd, 0, ring, 0); +} + + /** * igt_post_hang_ring: * @fd: open i915 drm file descriptor |