diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-08-30 11:44:51 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-08-30 11:44:51 +0100 |
| commit | 10552b5ca6c193e0c696e96c9f5e0d6142f4d8ee (patch) | |
| tree | 3444d7c434189df481759c8419c6c092155fc872 /tests/gem_hangcheck_forcewake.c | |
| parent | 255bade1ea98e642fe6d01c9dee8d5e8661bd816 (diff) | |
batch: Specify number of relocations to accommodate
Since relocations are variable size, depending upon generation, it is
easier to handle the resizing of the batch request inside the
BEGIN_BATCH macro. This still leaves us with having to resize commands
in a few places - which still need adaption for gen8+.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/gem_hangcheck_forcewake.c')
| -rw-r--r-- | tests/gem_hangcheck_forcewake.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/gem_hangcheck_forcewake.c b/tests/gem_hangcheck_forcewake.c index 219a2653..ec74c511 100644 --- a/tests/gem_hangcheck_forcewake.c +++ b/tests/gem_hangcheck_forcewake.c @@ -88,9 +88,8 @@ igt_simple_main pitch /= 4; for (i = 0; i < 10000; i++) { - BLIT_COPY_BATCH_START(devid, - XY_SRC_COPY_BLT_SRC_TILED | - XY_SRC_COPY_BLT_DST_TILED); + BLIT_COPY_BATCH_START(XY_SRC_COPY_BLT_SRC_TILED | + XY_SRC_COPY_BLT_DST_TILED); OUT_BATCH((3 << 24) | /* 32 bits */ (0xcc << 16) | /* copy ROP */ pitch); @@ -102,8 +101,8 @@ igt_simple_main OUT_RELOC_FENCED(bo, I915_GEM_DOMAIN_RENDER, 0, 0); ADVANCE_BATCH(); - if (IS_GEN6(devid) || IS_GEN7(devid)) { - BEGIN_BATCH(3); + if (batch->gen >= 6) { + BEGIN_BATCH(3, 0); OUT_BATCH(XY_SETUP_CLIP_BLT_CMD); OUT_BATCH(0); OUT_BATCH(0); |