AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: verify that adding a dmabuf bind actually chooses a modifier

Browse Source 
this at least provides some checking to catch cases where something
stupid happens and it does a fallback to linear

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33652>
This commit is contained in:
Mike Blumenkrantz
2025-01-30 07:58:14 -05:00
committed by Marge Bot
parent 5176370694
commit 93cd4ae0c0
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt
View File

@@ -685,3 +685,6 @@ spec@ext_framebuffer_multisample@interpolation 2 centroid-deriv-disabled,Fail
# New crash with Xe KMD
spec@!opengl 1.1@streaming-texture-leak,Crash
# ANV doesn't support 3D dmabufs
spec@egl 1.4@egl-ext_egl_image_storage,Crash

3
src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
View File

@@ -670,3 +670,6 @@ glx@glx_arb_sync_control@swapbuffersmsc-return,Fail
glx@glx_arb_sync_control@swapbuffersmsc-divisor-zero,Fail
glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 0,Fail
glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 1,Fail
# ANV doesn't support 3D dmabufs
spec@egl 1.4@egl-ext_egl_image_storage,Crash

5
src/gallium/drivers/zink/zink_resource.c
View File

@@ -1475,6 +1475,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t
obj->unordered_read = true;
obj->unordered_write = true;
obj->unsync_access = true;
obj->modifier = DRM_FORMAT_MOD_INVALID;
obj->last_dt_idx = obj->dt_idx = UINT32_MAX; //TODO: unionize
struct mem_alloc_info alloc_info = {
@@ -1726,6 +1727,7 @@ add_resource_bind(struct zink_context *ctx, struct zink_resource *res, unsigned
assert((res->base.b.bind & bind) == 0);
res->base.b.bind |= bind;
struct zink_resource_object *old_obj = res->obj;
ASSERTED uint64_t mod = DRM_FORMAT_MOD_INVALID;
if (bind & ZINK_BIND_DMABUF && !res->modifiers_count && !res->obj->is_buffer && screen->info.have_EXT_image_drm_format_modifier) {
res->modifiers_count = 1;
res->modifiers = malloc(res->modifiers_count * sizeof(uint64_t));
@@ -1734,7 +1736,7 @@ add_resource_bind(struct zink_context *ctx, struct zink_resource *res, unsigned
return false;
}
res->modifiers[0] = DRM_FORMAT_MOD_LINEAR;
mod = res->modifiers[0] = DRM_FORMAT_MOD_LINEAR;
}
struct zink_resource_object *new_obj = resource_object_create(screen, &res->base.b, NULL, &res->linear, res->modifiers, res->modifiers_count, NULL, NULL);
if (!new_obj) {
@@ -1742,6 +1744,7 @@ add_resource_bind(struct zink_context *ctx, struct zink_resource *res, unsigned
res->base.b.bind &= ~bind;
return false;
}
assert(mod == DRM_FORMAT_MOD_INVALID || new_obj->modifier == DRM_FORMAT_MOD_LINEAR);
struct zink_resource staging = *res;
staging.obj = old_obj;
staging.all_binds = 0;