fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

panfrost: Reserve thread storage descriptor in panfrost_launch_grid()

Browse source 
If we don't do that the compute batch is left with an empty thread
storage descriptor, and panfrost_batch_submit() tries to emit an FB
descriptors using invalid FB information.

Reported-by: Italo Nicola <italonicola@collabora.com>
Fixes: ff3eada7eb ("panfrost: Use the generic preload and FB helpers in the gallium driver")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Tested-by: Italo Nicola <italonicola@collabora.com>
Reviewed-by: Italo Nicola <italonicola@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10312>
(cherry picked from commit 8d9b52f45a)
This commit is contained in:
Boris Brezillon 2021-04-19 09:43:48 +02:00 • committed by Eric Engestrom
parent 2c21bc476f
commit 3ed9152fd1
6 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -103,7 +103,7 @@
"description": "panfrost: Reserve thread storage descriptor in panfrost_launch_grid()",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "ff3eada7eb4e4df0abe93ee76b77101f9d24e72c"
},

2
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -2258,7 +2258,7 @@ panfrost_emit_tls(struct panfrost_batch *batch)
struct panfrost_device *dev = pan_device(batch->ctx->base.screen);
/* Emitted with the FB descriptor on Midgard. */
if (!pan_is_bifrost(dev))
if (!pan_is_bifrost(dev) && batch->framebuffer.gpu)
return;
struct panfrost_bo *tls_bo =

5
src/gallium/drivers/panfrost/pan_compute.c
View file

@ -101,6 +101,11 @@ panfrost_launch_grid(struct pipe_context *pipe,
struct panfrost_device *dev = pan_device(pipe->screen);
struct panfrost_batch *batch = panfrost_get_batch_for_fbo(ctx);
/* Reserve a thread storage descriptor now (will be emitted at submit
* time).
*/
panfrost_batch_reserve_tls(batch, true);
/* TODO: Indirect compute dispatch */
assert(!info->indirect);

2
src/gallium/drivers/panfrost/pan_context.c
View file

@ -460,7 +460,7 @@ panfrost_direct_draw(struct panfrost_context *ctx,
unsigned vertex_count = ctx->vertex_count;
mali_ptr shared_mem = panfrost_batch_reserve_tls(batch);
mali_ptr shared_mem = panfrost_batch_reserve_tls(batch, false);
unsigned min_index = 0, max_index = 0;
mali_ptr indices = 0;

6
src/gallium/drivers/panfrost/pan_job.c
View file

@ -910,7 +910,7 @@ panfrost_batch_reserve_framebuffer(struct panfrost_batch *batch)
}
mali_ptr
panfrost_batch_reserve_tls(struct panfrost_batch *batch)
panfrost_batch_reserve_tls(struct panfrost_batch *batch, bool compute)
{
struct panfrost_device *dev = pan_device(batch->ctx->base.screen);
@ -919,7 +919,7 @@ panfrost_batch_reserve_tls(struct panfrost_batch *batch)
if (batch->tls.gpu)
return batch->tls.gpu;
if (pan_is_bifrost(dev)) {
if (pan_is_bifrost(dev) || compute) {
batch->tls = panfrost_pool_alloc_desc(&batch->pool, LOCAL_STORAGE);
} else {
/* On Midgard, the FB descriptor contains a thread storage
@ -1122,7 +1122,7 @@ panfrost_batch_submit(struct panfrost_batch *batch,
panfrost_batch_to_fb_info(batch, &fb, rts, &zs, &s, false);
panfrost_batch_reserve_tls(batch);
panfrost_batch_reserve_tls(batch, false);
panfrost_batch_draw_wallpaper(batch, &fb);

2
src/gallium/drivers/panfrost/pan_job.h
View file

@ -200,6 +200,6 @@ mali_ptr
panfrost_batch_reserve_framebuffer(struct panfrost_batch *batch);
mali_ptr
panfrost_batch_reserve_tls(struct panfrost_batch *batch);
panfrost_batch_reserve_tls(struct panfrost_batch *batch, bool compute);
#endif