From caf55e7bfd06b4d1001df4e188ea69bee71d0619 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 16 Dec 2019 11:46:32 -0500 Subject: [PATCH] panfrost: Fix FBD issue Signed-off-by: Alyssa Rosenzweig Fixes: b0e915b4e65 ("panfrost: Emit SFBD/MFBD after a batch, instead of before") Part-of: --- src/gallium/drivers/panfrost/pan_fragment.c | 4 ---- src/gallium/drivers/panfrost/pan_job.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_fragment.c b/src/gallium/drivers/panfrost/pan_fragment.c index 438294926fd..88b2db3c949 100644 --- a/src/gallium/drivers/panfrost/pan_fragment.c +++ b/src/gallium/drivers/panfrost/pan_fragment.c @@ -102,10 +102,6 @@ panfrost_fragment_job(struct panfrost_batch *batch, bool has_draws, .framebuffer = framebuffer, }; - /* Normally, there should be no padding. However, fragment jobs are - * shared with 64-bit Bifrost systems, and accordingly there is 4-bytes - * of zero padding in between. */ - struct panfrost_transfer transfer = panfrost_allocate_transient(batch, sizeof(header) + sizeof(payload)); memcpy(transfer.cpu, &header, sizeof(header)); memcpy(transfer.cpu + sizeof(header), &payload, sizeof(payload)); diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c index dbab1df1b83..5722f4a1f31 100644 --- a/src/gallium/drivers/panfrost/pan_job.c +++ b/src/gallium/drivers/panfrost/pan_job.c @@ -623,6 +623,7 @@ panfrost_batch_get_polygon_list(struct panfrost_batch *batch, unsigned size) assert(batch->polygon_list->size >= size); } else { /* Create the BO as invisible, as there's no reason to map */ + size = util_next_power_of_two(size); batch->polygon_list = panfrost_batch_create_bo(batch, size, PAN_BO_INVISIBLE, @@ -962,7 +963,7 @@ panfrost_batch_submit(struct panfrost_batch *batch) /* Now that all draws are in, we can finally prepare the * FBD for the batch */ - if (batch->framebuffer.gpu) { + if (batch->framebuffer.gpu && batch->first_job.gpu) { struct panfrost_context *ctx = batch->ctx; struct pipe_context *gallium = (struct pipe_context *) ctx; struct panfrost_screen *screen = pan_screen(gallium->screen); -- 2.30.2