flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-24 00:06:09 +00:00
Code Issues Releases Wiki Activity

igt/gem_ringfill: Set MI_MEM_VIRTUAL flag for gen<6

Browse Source 
bit22 of MI_STORE_DWORD is confusing as the meaning changed between
physical/virtual addressing in early gen and GTT/ppGTT in later gen. It
looks like gen4 and gen5 still need the flag.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-01-28 13:59:57 +00:00
parent eaa03678b0
commit 3ec8b1d28e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/gem_ringfill.c
View File

@ -88,9 +88,9 @@ static void run_test(int fd, unsigned ring, unsigned flags)
uint32_t *batch, *b; uint32_t *batch, *b;
int i; int i;
gem_require_ring(fd, ring);
igt_skip_on_f(gen == 6 && (ring & ~(3<<13)) == I915_EXEC_BSD, igt_skip_on_f(gen == 6 && (ring & ~(3<<13)) == I915_EXEC_BSD,
"MI_STORE_DATA broken on gen6 bsd\n"); "MI_STORE_DATA broken on gen6 bsd\n");
gem_require_ring(fd, ring);
gem_quiescent_gpu(fd); gem_quiescent_gpu(fd);
@ -98,7 +98,7 @@ static void run_test(int fd, unsigned ring, unsigned flags)
execbuf.buffers_ptr = (uintptr_t)obj; execbuf.buffers_ptr = (uintptr_t)obj;
execbuf.buffer_count = 2; execbuf.buffer_count = 2;
execbuf.flags = ring | (1 << 11); execbuf.flags = ring | (1 << 11);
if (gen < 4) if (gen < 6)
execbuf.flags |= I915_EXEC_SECURE; execbuf.flags |= I915_EXEC_SECURE;
memset(obj, 0, sizeof(obj)); memset(obj, 0, sizeof(obj));
@ -129,7 +129,7 @@ static void run_test(int fd, unsigned ring, unsigned flags)
reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION;
offset = obj[0].offset + reloc[i].delta; offset = obj[0].offset + reloc[i].delta;
*b++ = MI_STORE_DWORD_IMM; *b++ = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0);
if (gen >= 8) { if (gen >= 8) {
*b++ = offset; *b++ = offset;
*b++ = offset >> 32; *b++ = offset >> 32;
@ -139,7 +139,6 @@ static void run_test(int fd, unsigned ring, unsigned flags)
reloc[i].offset += sizeof(*batch); reloc[i].offset += sizeof(*batch);
} else { } else {
b[-1] -= 1; b[-1] -= 1;
b[-1] |= 1 << 22;
*b++ = offset; *b++ = offset;
} }
*b++ = i; *b++ = i;