Module: Mesa Branch: staging/22.3 Commit: f5a76ad137376febdc993b4e9f605261a777de32 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5a76ad137376febdc993b4e9f605261a777de32
Author: Mike Blumenkrantz <[email protected]> Date: Fri Jan 27 12:52:23 2023 -0500 Revert "zink: allow direct memory mapping for any COHERENT+CACHED buffer" This reverts commit a3552048c7e7b8afebfc99caac6d555439ddf2bc. on some drivers this catches qbos, which then hits the below assert. needs more investigation Fixes: a3552048c7e ("zink: allow direct memory mapping for any COHERENT+CACHED buffer") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20912> (cherry picked from commit 07809c45271a25066c583ca90b7365e0d88daf0d) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_bo.h | 1 - src/gallium/drivers/zink/zink_resource.c | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8c540f6b6ba..a9057dcf1e2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -157,7 +157,7 @@ "description": "Revert \"zink: allow direct memory mapping for any COHERENT+CACHED buffer\"", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a3552048c7e7b8afebfc99caac6d555439ddf2bc" }, diff --git a/src/gallium/drivers/zink/zink_bo.h b/src/gallium/drivers/zink/zink_bo.h index 42b1fc6437e..42e5ec22563 100644 --- a/src/gallium/drivers/zink/zink_bo.h +++ b/src/gallium/drivers/zink/zink_bo.h @@ -30,7 +30,6 @@ #include "zink_batch.h" #define VK_VIS_VRAM (VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) -#define VK_STAGING_RAM (VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT) #define VK_LAZY_VRAM (VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index eb7bb894c7b..c070ec04c7f 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -1864,9 +1864,7 @@ zink_buffer_map(struct pipe_context *pctx, goto success; usage |= PIPE_MAP_UNSYNCHRONIZED; } else if (!(usage & PIPE_MAP_UNSYNCHRONIZED) && - (((usage & PIPE_MAP_READ) && !(usage & PIPE_MAP_PERSISTENT) && - ((screen->info.mem_props.memoryTypes[res->obj->bo->base.placement].propertyFlags & VK_STAGING_RAM) != VK_STAGING_RAM)) || - !res->obj->host_visible)) { + (((usage & PIPE_MAP_READ) && !(usage & PIPE_MAP_PERSISTENT) && res->base.b.usage != PIPE_USAGE_STAGING) || !res->obj->host_visible)) { assert(!(usage & (TC_TRANSFER_MAP_THREADED_UNSYNC | PIPE_MAP_THREAD_SAFE))); if (!res->obj->host_visible || !(usage & PIPE_MAP_ONCE)) { overwrite:
