Module: Mesa Branch: staging/22.0 Commit: 1688c0b81f5809a49b2b1a17fab6fa73b67aeb46 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1688c0b81f5809a49b2b1a17fab6fa73b67aeb46
Author: Dave Airlie <[email protected]> Date: Thu Apr 28 10:43:45 2022 +1000 llvmpipe: add user memory resources to the debug global list. Otherwise things will crash on destruction. Reviewed-by: Mike Blumenkrantz <[email protected]> Fixes: 9a57dceeb760 ("llvmpipe: add support for user memory pointers") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16207> (cherry picked from commit b4bbf9d1acf04debb0abd2c3ebeac21fe389cf83) --- .pick_status.json | 2 +- src/gallium/drivers/llvmpipe/lp_texture.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index f4c922c038b..1907cbffcbc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -196,7 +196,7 @@ "description": "llvmpipe: add user memory resources to the debug global list.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "because_sha": "9a57dceeb760a1d4f7d9d1666bec0844ee41852e" }, { diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c index 8555b9ec761..9b628224f95 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.c +++ b/src/gallium/drivers/llvmpipe/lp_texture.c @@ -657,6 +657,11 @@ llvmpipe_resource_from_user_memory(struct pipe_screen *_screen, } else lpr->data = user_memory; lpr->user_ptr = true; +#ifdef DEBUG + mtx_lock(&resource_list_mutex); + list_addtail(&lpr->list, &resource_list.list); + mtx_unlock(&resource_list_mutex); +#endif return &lpr->base; fail: FREE(lpr);
