From 0bc26efdc47d9d0efbd1b4a31d18cbb0bed65677 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Wed, 7 Feb 2024 09:59:40 +0100
Subject: [PATCH] panfrost: v4 doesn't have Blend descriptors

Drop the Blend descriptor definition in v4.xml, and adjust
pan_blitter accordingly.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27515>
---
 src/panfrost/lib/genxml/v4.xml | 13 -------------
 src/panfrost/lib/pan_blitter.c |  5 +++++
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/panfrost/lib/genxml/v4.xml b/src/panfrost/lib/genxml/v4.xml
index 63b7f7f57ac..2c0669f975f 100644
--- a/src/panfrost/lib/genxml/v4.xml
+++ b/src/panfrost/lib/genxml/v4.xml
@@ -462,19 +462,6 @@
     <field name="Color Mask" size="4" start="0:28" type="uint"/>
   </struct>
 
-  <struct name="Blend" size="4" align="16">
-    <field name="Load Destination" size="1" start="0:0" type="bool" default="false"/>
-    <field name="Blend Shader" size="1" start="0:1" type="bool" default="false"/>
-    <field name="Blend Shader Contains Discard" size="1" start="0:2" type="bool" default="false"/>
-    <field name="Alpha To One" size="1" start="0:8" type="bool"/>
-    <field name="Enable" size="1" start="0:9" type="bool" default="true"/>
-    <field name="sRGB" size="1" start="0:10" type="bool" default="false"/>
-    <field name="Round to FB precision" size="1" start="0:11" type="bool" default="false"/>
-    <field name="Shader PC" size="64" start="2:0" type="address"/>
-    <field name="Equation" size="32" start="2:0" type="Blend Equation"/>
-    <field name="Constant" size="32" start="3:0" type="float"/>
-  </struct>
-
   <struct name="Invocation">
     <!-- Dynamic bitfield containing WorkGroupSize.xyz, NumWorkGroups.xyz
       The number of bits allocated for each number is based on the *_shift
diff --git a/src/panfrost/lib/pan_blitter.c b/src/panfrost/lib/pan_blitter.c
index 8ae0b8bc9b3..ae708d9e8d3 100644
--- a/src/panfrost/lib/pan_blitter.c
+++ b/src/panfrost/lib/pan_blitter.c
@@ -756,10 +756,15 @@ pan_blitter_get_rsd(struct pan_blitter_cache *cache,
    rsd = rzalloc(cache->rsds.rsds, struct pan_blit_rsd_data);
    rsd->key = rsd_key;
 
+#if PAN_ARCH == 4
+   struct panfrost_ptr rsd_ptr =
+      pan_pool_alloc_desc(cache->rsds.pool, RENDERER_STATE);
+#else
    unsigned bd_count = PAN_ARCH >= 5 ? MAX2(views->rt_count, 1) : 0;
    struct panfrost_ptr rsd_ptr = pan_pool_alloc_desc_aggregate(
       cache->rsds.pool, PAN_DESC(RENDERER_STATE),
       PAN_DESC_ARRAY(bd_count, BLEND));
+#endif
 
    mali_ptr blend_shaders[8] = {0};