OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavapipe: delete unused pipelines immediately

Browse Source 
deferring these can cause memory ballooning and oom

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21051>
This commit is contained in:
Mike Blumenkrantz
2023-02-01 11:03:29 -05:00
committed by Marge Bot
parent 408606af02
commit 59af3b4ad4
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/frontends/lavapipe/lvp_execute.c
View File

@@ -1051,6 +1051,7 @@ static void handle_pipeline(struct vk_cmd_queue_entry *cmd,
struct rendering_state *state) struct rendering_state *state)
{ {
LVP_FROM_HANDLE(lvp_pipeline, pipeline, cmd->u.bind_pipeline.pipeline); LVP_FROM_HANDLE(lvp_pipeline, pipeline, cmd->u.bind_pipeline.pipeline);
pipeline->used = true;
if (pipeline->is_compute_pipeline) { if (pipeline->is_compute_pipeline) {
handle_compute_pipeline(cmd, state); handle_compute_pipeline(cmd, state);
handle_pipeline_access(state, MESA_SHADER_COMPUTE); handle_pipeline_access(state, MESA_SHADER_COMPUTE);

10
src/gallium/frontends/lavapipe/lvp_pipeline.c
View File

@@ -79,9 +79,13 @@ VKAPI_ATTR void VKAPI_CALL lvp_DestroyPipeline(
if (!_pipeline) if (!_pipeline)
return; return;
simple_mtx_lock(&device->queue.pipeline_lock); if (pipeline->used) {
util_dynarray_append(&device->queue.pipeline_destroys, struct lvp_pipeline*, pipeline); simple_mtx_lock(&device->queue.pipeline_lock);
simple_mtx_unlock(&device->queue.pipeline_lock); util_dynarray_append(&device->queue.pipeline_destroys, struct lvp_pipeline*, pipeline);
simple_mtx_unlock(&device->queue.pipeline_lock);
} else {
lvp_pipeline_destroy(device, pipeline);
}
} }
static void static void

1
src/gallium/frontends/lavapipe/lvp_private.h
View File

@@ -457,6 +457,7 @@ struct lvp_pipeline {
bool library; bool library;
bool noop_fs; bool noop_fs;
bool compiled; bool compiled;
bool used;
}; };
void void