diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2020-09-11 18:47:04 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-10-14 19:29:31 +0200 |
| commit | 2e1e97c66b84c27f3139b81256855acaf4413017 (patch) | |
| tree | 08b90c7cfaa8bd620ebab883e2baa36e01bc3a49 | |
| parent | e68b26695af882fea58592c74f2ded545557b8b6 (diff) | |
etnaviv: stop leaking the dummy texure descriptor BO
Free the dummy texture descriptor BO on context destroy.
Fixes: eda73d71277a (etnaviv: GC7000: Texture descriptors)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Guido Günther <agx@sigxcpu.org>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: <mesa-stable@lists.freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6986>
(cherry picked from commit 9d5ec7f6f2c480093b2880387acf4a892c1d28f3)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_context.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index d60ba5ffd20..948a8dc58f1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -7807,7 +7807,7 @@ "description": "etnaviv: stop leaking the dummy texure descriptor BO", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "eda73d71277a0dd9d7832da96c2aaca2dd513d4d" }, diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c index 832cecbf65d..d2f7e8e6b80 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_context.c +++ b/src/gallium/drivers/etnaviv/etnaviv_context.c @@ -130,6 +130,9 @@ etna_context_destroy(struct pipe_context *pctx) } mtx_unlock(&ctx->lock); + if (ctx->dummy_desc_bo) + etna_bo_del(ctx->dummy_desc_bo); + if (ctx->dummy_rt) etna_bo_del(ctx->dummy_rt); |