fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 00:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: handle errors allocating csf oom-handler

Browse source 
This just wires up error-handling in the csf_oom_handler_init function,
and propagates it up to the csf_init_context function, as appropriate.

Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32428>
This commit is contained in:
Erik Faye-Lund 2024-11-14 17:35:17 +01:00 • committed by Marge Bot
parent 56abe1e472
commit c8a6709cbc
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/gallium/drivers/panfrost/pan_csf.c
View file

@ -92,17 +92,19 @@ csf_update_tiler_oom_ctx(struct cs_builder *b, uint64_t addr)
(PAN_INCREMENTAL_RENDERING_##_pass##_PASS * sizeof(struct panfrost_ptr)) + \
offsetof(struct panfrost_ptr, gpu))
static void
static int
csf_oom_handler_init(struct panfrost_context *ctx)
{
struct panfrost_bo *cs_bo = NULL, *reg_save_bo = NULL;
struct panfrost_device *dev = pan_device(ctx->base.screen);
struct panfrost_bo *cs_bo =
panfrost_bo_create(dev, 4096, 0, "Temporary CS buffer");
assert(cs_bo);
struct panfrost_bo *reg_save_bo =
cs_bo =
panfrost_bo_create(dev, 4096, 0, "Temporary CS buffer");
reg_save_bo =
panfrost_bo_create(dev, 4096, 0, "reg save bo");
assert(reg_save_bo);
if (!cs_bo || !reg_save_bo)
goto fail;
struct cs_buffer queue = {
.cpu = cs_bo->ptr.cpu,
@ -189,6 +191,17 @@ csf_oom_handler_init(struct panfrost_context *ctx)
ctx->csf.tiler_oom_handler.cs_bo = cs_bo;
ctx->csf.tiler_oom_handler.length = handler.length * sizeof(uint64_t);
ctx->csf.tiler_oom_handler.save_bo = reg_save_bo;
return 0;
fail:
if (cs_bo)
panfrost_bo_unreference(cs_bo);
if (reg_save_bo)
panfrost_bo_unreference(reg_save_bo);
return -1;
}
#undef FBD_OFFSET
@ -1437,7 +1450,8 @@ GENX(csf_init_context)(struct panfrost_context *ctx)
if (cs_bo == NULL)
goto err_tiler_heap_cs_bo;
csf_oom_handler_init(ctx);
if (csf_oom_handler_init(ctx))
goto err_g_submit;
struct cs_buffer init_buffer = {
.cpu = cs_bo->ptr.cpu,