diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-01-22 17:25:08 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-01-22 17:26:33 +0000 |
| commit | fbb0f636bd8ac898145b52961f5f7996f01ddc08 (patch) | |
| tree | df676ce712673f2ff09f608412f3557685ef4076 /tests/gem_ringfill.c | |
| parent | 4a3a8263427db6e1d2779a092ab6fc035e8aca3f (diff) | |
igt: Fix use MI_STORE_DATA_IMM on gen3
For the older gen, MI_STORE_DATA_IMM is a privileged command so we need
to set the "secure" batch flag, and we also need to instruct the command
to use the GTT virtual address.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/gem_ringfill.c')
| -rw-r--r-- | tests/gem_ringfill.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c index bceea9fd..345e9920 100644 --- a/tests/gem_ringfill.c +++ b/tests/gem_ringfill.c @@ -100,6 +100,8 @@ static void run_test(int fd, unsigned ring, unsigned flags) execbuf.buffers_ptr = (uintptr_t)obj; execbuf.buffer_count = 2; execbuf.flags = ring | (1 << 11); + if (gen < 4) + execbuf.flags |= I915_EXEC_SECURE; memset(obj, 0, sizeof(obj)); obj[0].handle = gem_create(fd, 4096); @@ -121,8 +123,8 @@ static void run_test(int fd, unsigned ring, unsigned flags) uint64_t offset; reloc[i].target_handle = obj[0].handle; - reloc[i].offset = (b - batch + 1) * sizeof(*batch); reloc[i].presumed_offset = obj[0].offset; + reloc[i].offset = (b - batch + 1) * sizeof(*batch); reloc[i].delta = i * sizeof(uint32_t); reloc[i].read_domains = I915_GEM_DOMAIN_INSTRUCTION; reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; @@ -137,6 +139,8 @@ static void run_test(int fd, unsigned ring, unsigned flags) *b++ = offset; reloc[i].offset += sizeof(*batch); } else { + b[-1] -= 1; + b[-1] |= 1 << 22; *b++ = offset; } *b++ = i; @@ -144,6 +148,7 @@ static void run_test(int fd, unsigned ring, unsigned flags) *b++ = MI_BATCH_BUFFER_END; munmap(batch, 16*1024+4096); gem_execbuf(fd, &execbuf); + check_bo(fd, obj[0].handle); memset(&hang, 0, sizeof(hang)); if (flags & HANG) @@ -215,7 +220,7 @@ igt_main igt_skip_on_simulation(); igt_fixture - fd = drm_open_driver(DRIVER_INTEL); + fd = drm_open_driver_master(DRIVER_INTEL); for (mode = modes; mode->prefix; mode++) { for (ring = rings; ring->name; ring++) { |