[Mesa-dev] [PATCH 1/2] intel/common: Add an is_kabylake field to gen_device_info

[Jason Ekstrand]

Most of the 3-D engine Kaby Lake is identical to Sky Lake.  However, there
are a few small differences that we need to be able to detect.

Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
---
 src/intel/common/gen_device_info.c | 14 +++++++++-----
 src/intel/common/gen_device_info.h |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/intel/common/gen_device_info.c b/src/intel/common/gen_device_info.c
index 30df0b2..3ff98f0 100644
--- a/src/intel/common/gen_device_info.c
+++ b/src/intel/common/gen_device_info.c
@@ -427,6 +427,10 @@ static const struct gen_device_info gen_device_info_bxt_2x6 = {
  * There's no KBL entry. Using the default SKL (GEN9) GS entries value.
  */
 
+#define KBL_FEATURES \
+   GEN9_FEATURES, \
+   .is_kabylake = true
+
 /*
  * Both SKL and KBL support a maximum of 64 threads per
  * Pixel Shader Dispatch (PSD) unit.
@@ -434,7 +438,7 @@ static const struct gen_device_info gen_device_info_bxt_2x6 = {
 #define  KBL_MAX_THREADS_PER_PSD 64
 
 static const struct gen_device_info gen_device_info_kbl_gt1 = {
-   GEN9_FEATURES,
+   KBL_FEATURES,
    .gt = 1,
 
    .max_cs_threads = 7 * 6,
@@ -444,7 +448,7 @@ static const struct gen_device_info gen_device_info_kbl_gt1 = {
 };
 
 static const struct gen_device_info gen_device_info_kbl_gt1_5 = {
-   GEN9_FEATURES,
+   KBL_FEATURES,
    .gt = 1,
 
    .max_cs_threads = 7 * 6,
@@ -453,7 +457,7 @@ static const struct gen_device_info gen_device_info_kbl_gt1_5 = {
 };
 
 static const struct gen_device_info gen_device_info_kbl_gt2 = {
-   GEN9_FEATURES,
+   KBL_FEATURES,
    .gt = 2,
 
    .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 3,
@@ -461,7 +465,7 @@ static const struct gen_device_info gen_device_info_kbl_gt2 = {
 };
 
 static const struct gen_device_info gen_device_info_kbl_gt3 = {
-   GEN9_FEATURES,
+   KBL_FEATURES,
    .gt = 3,
 
    .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 6,
@@ -469,7 +473,7 @@ static const struct gen_device_info gen_device_info_kbl_gt3 = {
 };
 
 static const struct gen_device_info gen_device_info_kbl_gt4 = {
-   GEN9_FEATURES,
+   KBL_FEATURES,
    .gt = 4,
 
    .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 9,
diff --git a/src/intel/common/gen_device_info.h b/src/intel/common/gen_device_info.h
index 10324e6..53ac5f6 100644
--- a/src/intel/common/gen_device_info.h
+++ b/src/intel/common/gen_device_info.h
@@ -41,6 +41,7 @@ struct gen_device_info
    bool is_haswell;
    bool is_cherryview;
    bool is_broxton;
+   bool is_kabylake;
 
    bool has_hiz_and_separate_stencil;
    bool must_use_separate_stencil;
-- 
2.5.0.400.gff86faf