From 3c35559eaf8dea46b5beb32b28198c025791e1fa Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Wed, 21 Apr 2021 10:24:37 +0200 Subject: [PATCH] panfrost: Fix indirect draws Use panfrost_batch_reserve_tls() to reserve the TSD. Cc: mesa-stable Fixes: ff3eada7eb4e ("panfrost: Use the generic preload and FB helpers in the gallium driver") Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Part-of: (cherry picked from commit 19849a6501e9f613b3a20a148e83fc38a0913c28) --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/pan_context.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7752612371e..7bae533ca64 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -139,7 +139,7 @@ "description": "panfrost: Fix indirect draws", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "ff3eada7eb4e4df0abe93ee76b77101f9d24e72c" }, diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index 47f15511718..22b68c260df 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -570,7 +570,7 @@ panfrost_indirect_draw(struct panfrost_context *ctx, panfrost_batch_set_requirements(batch); - mali_ptr shared_mem = panfrost_batch_reserve_framebuffer(batch); + mali_ptr shared_mem = panfrost_batch_reserve_tls(batch, false); struct panfrost_ptr tiler = panfrost_pool_alloc_aligned(&batch->pool,