From fa964dcadc8b34980577249d86d8f97b8a730d1b Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Wed, 2 Aug 2023 00:21:51 -0700
Subject: [PATCH] iris: Build for Xe3

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31838>
---
 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 6b8372a5bdc..6baac5d2605 100644
--- a/src/gallium/drivers/iris/iris_context.c
+++ b/src/gallium/drivers/iris/iris_context.c
@@ -260,6 +260,9 @@ iris_destroy_context(struct pipe_context *ctx)
 
 #define genX_call(devinfo, func, ...)             \
    switch ((devinfo)->verx10) {                   \
+   case 300:                                      \
+      gfx30_##func(__VA_ARGS__);                  \
+      break;                                      \
    case 200:                                      \
       gfx20_##func(__VA_ARGS__);                  \
       break;                                      \
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h
index 76b66b16c00..e913cb31d47 100644
--- a/src/gallium/drivers/iris/iris_context.h
+++ b/src/gallium/drivers/iris/iris_context.h
@@ -1528,6 +1528,9 @@ iris_execute_indirect_draw_supported(const struct iris_context *ice,
 #  define genX(x) gfx20_##x
 #  include "iris_genx_protos.h"
 #  undef genX
+#  define genX(x) gfx30_##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 18b19cd003d..eeb8314c9d4 100644
--- a/src/gallium/drivers/iris/iris_indirect_gen.c
+++ b/src/gallium/drivers/iris/iris_indirect_gen.c
@@ -55,6 +55,8 @@
 # include "intel_gfx125_shaders_code.h"
 #elif GFX_VERx10 == 200
 # include "intel_gfx20_shaders_code.h"
+#elif GFX_VERx10 == 300
+# include "intel_gfx30_shaders_code.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 b2dbc235ea5..ed5a02b9232 100644
--- a/src/gallium/drivers/iris/iris_screen.c
+++ b/src/gallium/drivers/iris/iris_screen.c
@@ -62,6 +62,9 @@
 
 #define genX_call(devinfo, func, ...)             \
    switch ((devinfo)->verx10) {                   \
+   case 300:                                      \
+      gfx30_##func(__VA_ARGS__);                  \
+      break;                                      \
    case 200:                                      \
       gfx20_##func(__VA_ARGS__);                  \
       break;                                      \
diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index 018c861292e..f2debddc023 100644
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@@ -54,7 +54,7 @@ files_libiris = files(
 )
 
 iris_per_hw_ver_libs = []
-foreach v : ['80', '90', '110', '120', '125', '200']
+foreach v : ['80', '90', '110', '120', '125', '200', '300']
   iris_per_hw_ver_libs += static_library(
     'iris_per_hw_ver@0@'.format(v),
     ['iris_blorp.c', 'iris_query.c', 'iris_state.c', 'iris_indirect_gen.c', gen_xml_pack],