From a98f0e280e9513caa44bb13643d2e9cf222efce9 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 28 Jan 2022 13:47:53 -0500 Subject: [PATCH] panfrost: Remove blend shader return value on v9 Removed since there's a new ABI for blend shaders. Even if we always write 0, it's better not to pack this at all, and to denoise the dumps. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_cmdstream.c | 9 ++++++--- src/panfrost/lib/genxml/v9.xml | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 569492e8816..c09bb95ea78 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -336,14 +336,17 @@ panfrost_emit_blend(struct panfrost_batch *batch, void *rts, mali_ptr *blend_sha (blend_shaders[i] & (0xffffffffull << 32)) == (fs->bin.gpu & (0xffffffffull << 32))); - unsigned ret_offset = fs->info.bifrost.blend[i].return_offset; - assert(!(ret_offset & 0x7)); - pan_pack(&packed->opaque[2], INTERNAL_BLEND, cfg) { cfg.mode = MALI_BLEND_MODE_SHADER; cfg.shader.pc = (u32) blend_shaders[i]; + +#if PAN_ARCH <= 7 + unsigned ret_offset = fs->info.bifrost.blend[i].return_offset; + assert(!(ret_offset & 0x7)); + cfg.shader.return_value = ret_offset ? fs->bin.gpu + ret_offset : 0; +#endif } } else { pan_pack(&packed->opaque[2], INTERNAL_BLEND, cfg) { diff --git a/src/panfrost/lib/genxml/v9.xml b/src/panfrost/lib/genxml/v9.xml index d9bb8b1a9bb..6918362d5fd 100644 --- a/src/panfrost/lib/genxml/v9.xml +++ b/src/panfrost/lib/genxml/v9.xml @@ -548,7 +548,6 @@ -