From c63030419692b433570a08d33a86e36adc16bc3a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 22 Jun 2021 05:40:49 +1000
Subject: [PATCH] crocus/gen8: hookup gen8 state generators

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11507>
---
 src/gallium/drivers/crocus/crocus_context.c | 3 +++
 src/gallium/drivers/crocus/crocus_context.h | 3 +++
 src/gallium/drivers/crocus/crocus_screen.c  | 3 +++
 src/gallium/drivers/crocus/meson.build      | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/crocus/crocus_context.c b/src/gallium/drivers/crocus/crocus_context.c
index 7d3d007c040..c417c2f3c9e 100644
--- a/src/gallium/drivers/crocus/crocus_context.c
+++ b/src/gallium/drivers/crocus/crocus_context.c
@@ -210,6 +210,9 @@ crocus_destroy_context(struct pipe_context *ctx)
 
 #define genX_call(devinfo, func, ...)                   \
    switch ((devinfo)->verx10) {                         \
+   case 80:                                             \
+      gfx8_##func(__VA_ARGS__);                         \
+      break;                                            \
    case 75:                                             \
       gfx75_##func(__VA_ARGS__);                        \
       break;                                            \
diff --git a/src/gallium/drivers/crocus/crocus_context.h b/src/gallium/drivers/crocus/crocus_context.h
index 458c05fd662..0e4fc2e7bc3 100644
--- a/src/gallium/drivers/crocus/crocus_context.h
+++ b/src/gallium/drivers/crocus/crocus_context.h
@@ -954,6 +954,9 @@ static inline bool crocus_check_conditional_render(struct crocus_context *ice)
 #  define genX(x) gfx75_##x
 #  include "crocus_genx_protos.h"
 #  undef genX
+#  define genX(x) gfx8_##x
+#  include "crocus_genx_protos.h"
+#  undef genX
 #endif
 
 #endif
diff --git a/src/gallium/drivers/crocus/crocus_screen.c b/src/gallium/drivers/crocus/crocus_screen.c
index 4eacec3c6f7..5d7d0ec71b4 100644
--- a/src/gallium/drivers/crocus/crocus_screen.c
+++ b/src/gallium/drivers/crocus/crocus_screen.c
@@ -59,6 +59,9 @@
 
 #define genX_call(devinfo, func, ...)                   \
    switch ((devinfo)->verx10) {                         \
+   case 80:                                             \
+      gfx8_##func(__VA_ARGS__);                         \
+      break;                                            \
    case 75:                                             \
       gfx75_##func(__VA_ARGS__);                        \
       break;                                            \
diff --git a/src/gallium/drivers/crocus/meson.build b/src/gallium/drivers/crocus/meson.build
index 2bdb1f2cfb5..a6bc5830afd 100644
--- a/src/gallium/drivers/crocus/meson.build
+++ b/src/gallium/drivers/crocus/meson.build
@@ -51,7 +51,7 @@ files_libcrocus = files(
 )
 
 crocus_per_hw_ver_libs = []
-foreach v : ['40', '45', '50', '60', '70', '75']
+foreach v : ['40', '45', '50', '60', '70', '75', '80']
   crocus_per_hw_ver_libs += static_library(
     'crocus_per_hw_ver@0@'.format(v),
     ['crocus_blorp.c', 'crocus_query.c', 'crocus_state.c', 'crocus_blt.c', gen_xml_pack],