i965: Consolidate GEN9 LP definition

Signed-off-by: Ben Widawsky <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>

1 files changed, 42 insertions, 80 deletions

diff --git a/src/intel/common/gen_device_info.c b/src/intel/common/gen_device_info.c
index 51fdf342324..b8d92278d73 100644
--- a/src/intel/common/gen_device_info.c
+++ b/src/intel/common/gen_device_info.c
@@ -346,6 +346,44 @@ static const struct gen_device_info gen_device_info_chv = {
       .max_gs_entries = 640,                        \
    }
 
+#define GEN9_LP_FEATURES                           \
+   GEN9_FEATURES,                                  \
+   .is_broxton = 1,                                \
+   .gt = 1,                                        \
+   .has_llc = false,                               \
+   .num_slices = 1,                                \
+   .max_vs_threads = 112,                          \
+   .max_tcs_threads = 112,                         \
+   .max_tes_threads = 112,                         \
+   .max_gs_threads = 112,                          \
+   .max_cs_threads = 6 * 6,                        \
+   .urb = {                                        \
+      .size = 192,                                 \
+      .min_vs_entries = 34,                        \
+      .min_ds_entries = 34,                        \
+      .max_vs_entries = 704,                       \
+      .max_tcs_entries = 256,                      \
+      .max_tes_entries = 416,                      \
+      .max_gs_entries = 256,                       \
+   }
+
+#define GEN9_LP_FEATURES_2X6                       \
+   GEN9_LP_FEATURES,                               \
+   .max_vs_threads = 56,                           \
+   .max_tcs_threads = 56,                          \
+   .max_tes_threads = 56,                          \
+   .max_gs_threads = 56,                           \
+   .max_cs_threads = 6 * 6,                        \
+   .urb = {                                        \
+      .size = 128,                                 \
+      .min_vs_entries = 34,                        \
+      .min_ds_entries = 34,                        \
+      .max_vs_entries = 352,                       \
+      .max_tcs_entries = 128,                      \
+      .max_tes_entries = 208,                      \
+      .max_gs_entries = 128,                       \
+   }
+
 static const struct gen_device_info gen_device_info_skl_gt1 = {
    GEN9_FEATURES, .gt = 1,
    .num_slices = 1,
@@ -377,49 +415,11 @@ static const struct gen_device_info gen_device_info_skl_gt4 = {
 };
 
 static const struct gen_device_info gen_device_info_bxt = {
-   GEN9_FEATURES,
-   .is_broxton = 1,
-   .gt = 1,
-   .has_llc = false,
-
-   .num_slices = 1,
-   .max_vs_threads = 112,
-   .max_tcs_threads = 112,
-   .max_tes_threads = 112,
-   .max_gs_threads = 112,
-   .max_cs_threads = 6 * 6,
-   .urb = {
-      .size = 192,
-      .min_vs_entries = 34,
-      .min_ds_entries = 34,
-      .max_vs_entries = 704,
-      .max_tcs_entries = 256,
-      .max_tes_entries = 416,
-      .max_gs_entries = 256,
-   }
+   GEN9_LP_FEATURES
 };
 
 static const struct gen_device_info gen_device_info_bxt_2x6 = {
-   GEN9_FEATURES,
-   .is_broxton = 1,
-   .gt = 1,
-   .has_llc = false,
-
-   .num_slices = 1,
-   .max_vs_threads = 56, /* XXX: guess */
-   .max_tcs_threads = 56, /* XXX: guess */
-   .max_tes_threads = 56,
-   .max_gs_threads = 56,
-   .max_cs_threads = 6 * 6,
-   .urb = {
-      .size = 128,
-      .min_vs_entries = 34,
-      .min_ds_entries = 34,
-      .max_vs_entries = 352,
-      .max_tcs_entries = 128,
-      .max_tes_entries = 208,
-      .max_gs_entries = 128,
-   }
+   GEN9_LP_FEATURES_2X6
 };
 /*
  * Note: for all KBL SKUs, the PRM says SKL for GS entries, not SKL+.
@@ -476,49 +476,11 @@ static const struct gen_device_info gen_device_info_kbl_gt4 = {
 };
 
 static const struct gen_device_info gen_device_info_glk = {
-   GEN9_FEATURES,
-   .is_broxton = 1,
-   .gt = 1,
-   .has_llc = false,
-
-   .num_slices = 1,
-   .max_vs_threads = 112,
-   .max_tcs_threads = 112,
-   .max_tes_threads = 112,
-   .max_gs_threads = 112,
-   .max_cs_threads = 6 * 6,
-   .urb = {
-      .size = 192,
-      .min_vs_entries = 34,
-      .min_ds_entries = 34,
-      .max_vs_entries = 704,
-      .max_tcs_entries = 256,
-      .max_tes_entries = 416,
-      .max_gs_entries = 256,
-   }
+   GEN9_LP_FEATURES
 };
 
 static const struct gen_device_info gen_device_info_glk_2x6 = {
-   GEN9_FEATURES,
-   .is_broxton = 1,
-   .gt = 1,
-   .has_llc = false,
-
-   .num_slices = 1,
-   .max_vs_threads = 56, /* XXX: guess */
-   .max_tcs_threads = 56, /* XXX: guess */
-   .max_tes_threads = 56,
-   .max_gs_threads = 56,
-   .max_cs_threads = 6 * 6,
-   .urb = {
-      .size = 128,
-      .min_vs_entries = 34,
-      .min_ds_entries = 34,
-      .max_vs_entries = 352,
-      .max_tcs_entries = 128,
-      .max_tes_entries = 208,
-      .max_gs_entries = 128,
-   }
+   GEN9_LP_FEATURES_2X6
 };
 
 bool