From 08735fd90d458295a37f23c5ba5e49d91b3f68c1 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Tue, 28 Jun 2022 14:31:11 -0700 Subject: [PATCH] intel/isl: Build for Xe2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is only *build* support in isl for Xe2. Before adding LNL PCI IDs, subsequent patches will fill in ISL updates for Xe2. Rework: * Rohan: Update isl_genX_declare_get_func Signed-off-by: Jordan Justen Reviewed-by: José Roberto de Souza Reviewed-by: Sagar Ghuge Part-of: --- src/intel/isl/isl.c | 3 +++ src/intel/isl/isl_priv.h | 5 +++++ src/intel/isl/meson.build | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 088c1cfad69..16898357537 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -3115,6 +3115,9 @@ isl_surf_get_ccs_surf(const struct isl_device *dev, case 125: \ isl_gfx125_##func(__VA_ARGS__); \ break; \ + case 200: \ + isl_gfx20_##func(__VA_ARGS__); \ + break; \ default: \ assert(!"Unknown hardware generation"); \ } diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h index db1cd7e4a40..0eb54264bf5 100644 --- a/src/intel/isl/isl_priv.h +++ b/src/intel/isl/isl_priv.h @@ -77,6 +77,8 @@ typedef void (*isl_emit_cpb_control_s_func)(const struct isl_device *dev, void * return isl_gfx12_##func; \ case 125: \ return isl_gfx125_##func; \ + case 200: \ + return isl_gfx20_##func; \ default: \ assert(!"Unknown hardware generation"); \ return NULL; \ @@ -291,6 +293,9 @@ _isl_notify_failure(const struct isl_surf_init_info *surf_info, # define genX(x) gfx125_##x # include "isl_genX_priv.h" # undef genX +# define genX(x) gfx20_##x +# include "isl_genX_priv.h" +# undef genX #endif #endif /* ISL_PRIV_H */ diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index b31989429cc..4092adbed59 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -64,7 +64,7 @@ isl_per_hw_ver_libs = [] foreach g : [['40', isl_gfx4_files], ['50', []], ['60', isl_gfx6_files], ['70', isl_gfx7_files], ['75', []], ['80', isl_gfx8_files], ['90', isl_gfx9_files], ['110', []], ['120', isl_gfx12_files], - ['125', isl_gfx12_files]] + ['125', isl_gfx12_files], ['200', isl_gfx12_files]] _gfx_ver = g[0] isl_per_hw_ver_libs += static_library( 'isl_per_hw_ver@0@'.format(_gfx_ver),