diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-03 10:52:47 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-03 18:10:01 +0000 |
| commit | fea731fda6d1b73a7ad65c7ba1753d40eb011f4e (patch) | |
| tree | fda7b5ce0a310262fc59103d760841d1564ee420 /tests/i915/gem_eio.c | |
| parent | 20ccb0b5fcc2ea59f40def186411bd531c17f08c (diff) | |
i915/gem_eio: Don't mix INVALID_CS and the cmdparser
Since the cmdparser causes it to discard the batch with INVALID_CS, we
are not being as thorough in our testing on gen9/bcs as we expect.
Furthermore, snb just dies, so don't.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Diffstat (limited to 'tests/i915/gem_eio.c')
| -rw-r--r-- | tests/i915/gem_eio.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/i915/gem_eio.c b/tests/i915/gem_eio.c index aa4accc9..0fe51efe 100644 --- a/tests/i915/gem_eio.c +++ b/tests/i915/gem_eio.c @@ -185,12 +185,16 @@ static igt_spin_t * __spin_poll(int fd, uint32_t ctx, unsigned long flags) struct igt_spin_factory opts = { .ctx = ctx, .engine = flags, - .flags = (IGT_SPIN_FAST | - IGT_SPIN_NO_PREEMPTION | - IGT_SPIN_INVALID_CS | - IGT_SPIN_FENCE_OUT), + .flags = IGT_SPIN_NO_PREEMPTION | IGT_SPIN_FENCE_OUT, }; + if (!gem_has_cmdparser(fd, opts.engine) && + intel_gen(intel_get_drm_devid(fd)) != 6) + opts.flags |= IGT_SPIN_INVALID_CS; + + if (intel_gen(intel_get_drm_devid(fd)) > 7) + opts.flags |= IGT_SPIN_FAST; + if (gem_can_store_dword(fd, opts.engine)) opts.flags |= IGT_SPIN_POLL_RUN; |