On Wed, 28 Jul 2021 03:30:34 -0700, Matthew Auld wrote: > > diff --git a/lib/i915/gem_mman.c b/lib/i915/gem_mman.c > index 337d28fb..6f5e6d72 100644 > --- a/lib/i915/gem_mman.c > +++ b/lib/i915/gem_mman.c > @@ -434,7 +434,13 @@ void *gem_mmap__device_coherent(int fd, uint32_t handle, uint64_t offset, > */ > void *__gem_mmap__cpu(int fd, uint32_t handle, uint64_t offset, uint64_t size, unsigned prot) > { > - return __gem_mmap(fd, handle, offset, size, prot, 0); > + void *ptr; > + > + ptr = __gem_mmap(fd, handle, offset, size, prot, 0); > + if (!ptr) > + ptr = __gem_mmap_offset__fixed(fd, handle, offset, size, prot); > + > + return ptr; What about __gem_mmap__wc? Also shouldn't we just fix the __gem_mmap_offset fallback in __gem_mmap and that will take care of both __gem_mmap__cpu and __gem_mmap__wc? (I think it will actually also fix __gem_mmap__device_coherent and __gem_mmap__cpu_coherent but maybe we can still have those patches in this series especially if they save a couple of system calls). _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx