summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2021-07-14 13:11:01 -0500
committerMarge Bot <eric+marge@anholt.net>2021-08-12 19:29:59 +0000
commit512fa2f4dab79588e8423b67ced3d5c67e0ae173 (patch)
tree074022e553f6cb0266fe59bf700876e55b5b3af3
parent54e4a36c3a25b6bb4cae0577ffa3b00f902e7542 (diff)
downloadmesa-512fa2f4dab79588e8423b67ced3d5c67e0ae173.tar.gz
anv: Use I915_MMAP_OFFSET_FIXED for LMEM platforms
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11888>
-rw-r--r--src/intel/vulkan/anv_gem.c6
1 files 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,