Mesa (main): anv: Use I915_MMAP_OFFSET_FIXED for LMEM platforms

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 512fa2f4dab79588e8423b67ced3d5c67e0ae173
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=512fa2f4dab79588e8423b67ced3d5c67e0ae173

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed Jul 14 13:11:01 2021 -0500

anv: Use I915_MMAP_OFFSET_FIXED for LMEM platforms

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11888>

---

 src/intel/vulkan/anv_gem.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/intel/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
index e10db2e04d7..51621cc5f00 100644
--- a/src/intel/vulkan/anv_gem.c
+++ b/src/intel/vulkan/anv_gem.c
@@ -99,8 +99,8 @@ anv_gem_mmap_offset(struct anv_device *device, uint32_t gem_handle,
 {
    struct drm_i915_gem_mmap_offset gem_mmap = {
       .handle = gem_handle,
-      .flags = (flags & I915_MMAP_WC) ?
-         I915_MMAP_OFFSET_WC : I915_MMAP_OFFSET_WB,
+      .flags = device->info.has_local_mem ? I915_MMAP_OFFSET_FIXED :
+         (flags & I915_MMAP_WC) ? I915_MMAP_OFFSET_WC : I915_MMAP_OFFSET_WB,
    };
    assert(offset == 0);
 
@@ -119,6 +119,8 @@ static void*
 anv_gem_mmap_legacy(struct anv_device *device, uint32_t gem_handle,
                     uint64_t offset, uint64_t size, uint32_t flags)
 {
+   assert(!device->info.has_local_mem);
+
    struct drm_i915_gem_mmap gem_mmap = {
       .handle = gem_handle,
       .offset = offset,