From efc0601ddfa0201bd3a4c085777e503e72d8e2ea Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 19 Jul 2022 16:46:02 -0700
Subject: [PATCH] intel/brw/xe2+: Double allowed SIMD width of FB write SEND
 messages.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28306>
---
 src/intel/compiler/brw_fs_lower_simd_width.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/intel/compiler/brw_fs_lower_simd_width.cpp b/src/intel/compiler/brw_fs_lower_simd_width.cpp
index 3b5714dbb59..4ea06b00e8b 100644
--- a/src/intel/compiler/brw_fs_lower_simd_width.cpp
+++ b/src/intel/compiler/brw_fs_lower_simd_width.cpp
@@ -315,9 +315,15 @@ brw_fs_get_lowered_simd_width(const fs_visitor *shader, const fs_inst *inst)
       return devinfo->ver >= 20 ? 16 : 8;
 
    case FS_OPCODE_FB_WRITE_LOGICAL:
-      /* Dual-source FB writes are unsupported in SIMD16 mode. */
-      return (inst->src[FB_WRITE_LOGICAL_SRC_COLOR1].file != BAD_FILE ?
-              8 : MIN2(16, inst->exec_size));
+      if (devinfo->ver >= 20) {
+         /* Dual-source FB writes are unsupported in SIMD32 mode. */
+         return (inst->src[FB_WRITE_LOGICAL_SRC_COLOR1].file != BAD_FILE ?
+                 16 : MIN2(32, inst->exec_size));
+      } else {
+         /* Dual-source FB writes are unsupported in SIMD16 mode. */
+         return (inst->src[FB_WRITE_LOGICAL_SRC_COLOR1].file != BAD_FILE ?
+                 8 : MIN2(16, inst->exec_size));
+      }
 
    case FS_OPCODE_FB_READ_LOGICAL:
       return MIN2(16, inst->exec_size);