From faefb3eec0e1a42879c33c3f8b8fa81e8916eb31 Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Fri, 16 Aug 2024 12:14:46 -0700
Subject: [PATCH] iris: Build for Xe3P (GFX_VERx10 == 350)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40208>
---
 src/gallium/drivers/iris/iris_context.c      | 3 +++
 src/gallium/drivers/iris/iris_context.h      | 3 +++
 src/gallium/drivers/iris/iris_indirect_gen.c | 2 ++
 src/gallium/drivers/iris/iris_screen.c       | 3 +++
 src/gallium/drivers/iris/meson.build         | 2 +-
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c
index 34db5362e5a..b82b68ff59c 100644
--- a/src/gallium/drivers/iris/iris_context.c
+++ b/src/gallium/drivers/iris/iris_context.c
@@ -243,6 +243,9 @@ iris_destroy_context(struct pipe_context *ctx)
 
 #define genX_call(devinfo, func, ...)             \
    switch ((devinfo)->verx10) {                   \
+   case 350:                                      \
+      gfx35_##func(__VA_ARGS__);                  \
+      break;                                      \
    case 300:                                      \
       gfx30_##func(__VA_ARGS__);                  \
       break;                                      \
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h
index 540aeb64e5e..1b0659ada0d 100644
--- a/src/gallium/drivers/iris/iris_context.h
+++ b/src/gallium/drivers/iris/iris_context.h
@@ -1558,6 +1558,9 @@ iris_execute_indirect_draw_supported(const struct iris_context *ice,
 #  define genX(x) gfx30_##x
 #  include "iris_genx_protos.h"
 #  undef genX
+#  define genX(x) gfx35_##x
+#  include "iris_genx_protos.h"
+#  undef genX
 #endif
 
 #endif
diff --git a/src/gallium/drivers/iris/iris_indirect_gen.c b/src/gallium/drivers/iris/iris_indirect_gen.c
index c39e98247dc..5df166be507 100644
--- a/src/gallium/drivers/iris/iris_indirect_gen.c
+++ b/src/gallium/drivers/iris/iris_indirect_gen.c
@@ -58,6 +58,8 @@
 # include "intel_gfx200_shaders_binding.h"
 #elif GFX_VERx10 == 300
 # include "intel_gfx300_shaders_binding.h"
+#elif GFX_VERx10 == 350
+# include "intel_gfx350_shaders_binding.h"
 #else
 # error "Unsupported generation"
 #endif
diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c
index 216f085bf30..a2624e914f5 100644
--- a/src/gallium/drivers/iris/iris_screen.c
+++ b/src/gallium/drivers/iris/iris_screen.c
@@ -43,6 +43,9 @@
 
 #define genX_call(devinfo, func, ...)             \
    switch ((devinfo)->verx10) {                   \
+   case 350:                                      \
+      gfx35_##func(__VA_ARGS__);                  \
+      break;                                      \
    case 300:                                      \
       gfx30_##func(__VA_ARGS__);                  \
       break;                                      \
diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index c101ddd16f4..91c1227abc9 100644
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@@ -55,7 +55,7 @@ files_libiris = files(
 )
 
 iris_per_hw_ver_libs = []
-foreach v : ['80', '90', '110', '120', '125', '200', '300']
+foreach v : ['80', '90', '110', '120', '125', '200', '300', '350']
   if v == '80' and not with_intel_elk
     continue
   endif