mirror of
https://github.com/tiagovignatti/intel-gpu-tools.git
synced 2026-08-22 13:52:54 +00:00
Make gem_mmap__{cpu,gtt,wc}() assert on failure
Rename the current gem_mmap__{cpu,gtt,wc}() functions into
__gem_mmap__{cpu,gtt,wc}(), and add back wrappers with the original name
that assert that the pointer is valid. Most callers will expect a valid
pointer and shouldn't have to bother with failures.
To avoid changing anything (yet), sed 's/gem_mmap__/__gem_mmap__/g'
over the entire codebase.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Stochastically-reviwewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
@@ -123,7 +123,7 @@ igt_simple_main
|
||||
|
||||
size = ALIGN(sizeof(mem_reloc), 4096);
|
||||
reloc_handle = gem_create(fd, size);
|
||||
reloc = gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
reloc = __gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
igt_assert(reloc);
|
||||
for (n = 0; n < MAX_NUM_RELOC; n++) {
|
||||
reloc[n].offset = 1024;
|
||||
@@ -148,7 +148,7 @@ igt_simple_main
|
||||
struct timeval start, end;
|
||||
|
||||
if (p->flags & FAULT)
|
||||
reloc = gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
reloc = __gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
else
|
||||
reloc = mem_reloc;
|
||||
|
||||
@@ -182,7 +182,7 @@ igt_simple_main
|
||||
}
|
||||
if (p->flags & FAULT) {
|
||||
munmap(reloc, size);
|
||||
reloc = gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
reloc = __gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
gem_exec[MAX_NUM_EXEC].relocs_ptr = (uintptr_t)reloc;
|
||||
}
|
||||
gem_execbuf(fd, &execbuf);
|
||||
@@ -212,7 +212,7 @@ igt_simple_main
|
||||
}
|
||||
if (p->flags & FAULT) {
|
||||
munmap(reloc, size);
|
||||
reloc = gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
reloc = __gem_mmap__cpu(fd, reloc_handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
gem_exec[MAX_NUM_EXEC].relocs_ptr = (uintptr_t)reloc;
|
||||
}
|
||||
gem_execbuf(fd, &execbuf);
|
||||
|
||||
Reference in New Issue
Block a user