i965/bxt: Add 2x6 variant

[mesa.git] / src / mesa / drivers / dri / i965 / brw_device_info.c

diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c b/src/mesa/drivers/dri/i965/brw_device_info.c
index 4eeca5cab9596d0d35d3a1454bcc9743c8f6caee..77bbe7855801a666f2d72eff7348aec0b96c0639 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_device_info.c
+++ b/src/mesa/drivers/dri/i965/brw_device_info.c
@@ -312,7 +312,7 @@ static const struct brw_device_info brw_device_info_chv = {
    .max_ds_threads = 80,
    .max_gs_threads = 80,
    .max_wm_threads = 128,
-   .max_cs_threads = 28,
+   .max_cs_threads = 6 * 7,
    .urb = {
       .size = 192,
       .min_vs_entries = 34,
@@ -384,24 +384,45 @@ static const struct brw_device_info brw_device_info_bxt = {
    .gt = 1,
    .has_llc = false,
 
-   /* XXX: These are preliminary thread counts and URB sizes. */
    .num_slices = 1,
-   .max_vs_threads = 56,
-   .max_hs_threads = 56,
-   .max_ds_threads = 56,
-   .max_gs_threads = 56,
-   .max_wm_threads = 32,
-   .max_cs_threads = 28,
+   .max_vs_threads = 112,
+   .max_hs_threads = 112,
+   .max_ds_threads = 112,
+   .max_gs_threads = 112,
+   .max_wm_threads = 64 * 3,
+   .max_cs_threads = 6 * 6,
    .urb = {
-      .size = 64,
+      .size = 192,
       .min_vs_entries = 34,
-      .max_vs_entries = 640,
-      .max_hs_entries = 80,
-      .max_ds_entries = 80,
+      .max_vs_entries = 704,
+      .max_hs_entries = 256,
+      .max_ds_entries = 416,
       .max_gs_entries = 256,
    }
 };
 
+static const struct brw_device_info brw_device_info_bxt_2x6 = {
+   GEN9_FEATURES,
+   .is_broxton = 1,
+   .gt = 1,
+   .has_llc = false,
+
+   .num_slices = 1,
+   .max_vs_threads = 56, /* XXX: guess */
+   .max_hs_threads = 56, /* XXX: guess */
+   .max_ds_threads = 56,
+   .max_gs_threads = 56,
+   .max_wm_threads = 64 * 2,
+   .max_cs_threads = 6 * 6,
+   .urb = {
+      .size = 128,
+      .min_vs_entries = 34,
+      .max_vs_entries = 352,
+      .max_hs_entries = 128,
+      .max_ds_entries = 208,
+      .max_gs_entries = 128,
+   }
+};
 /*
  * Note: for all KBL SKUs, the PRM says SKL for GS entries, not SKL+.
  * There's no KBL entry. Using the default SKL (GEN9) GS entries value.
@@ -420,6 +441,7 @@ static const struct brw_device_info brw_device_info_kbl_gt1 = {
    .max_cs_threads = 7 * 6,
    .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 2,
    .urb.size = 192,
+   .num_slices = 1,
 };
 
 static const struct brw_device_info brw_device_info_kbl_gt1_5 = {
@@ -428,6 +450,7 @@ static const struct brw_device_info brw_device_info_kbl_gt1_5 = {
 
    .max_cs_threads = 7 * 6,
    .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 3,
+   .num_slices = 1,
 };
 
 static const struct brw_device_info brw_device_info_kbl_gt2 = {
@@ -435,6 +458,7 @@ static const struct brw_device_info brw_device_info_kbl_gt2 = {
    .gt = 2,
 
    .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 3,
+   .num_slices = 1,
 };
 
 static const struct brw_device_info brw_device_info_kbl_gt3 = {
@@ -442,6 +466,7 @@ static const struct brw_device_info brw_device_info_kbl_gt3 = {
    .gt = 3,
 
    .max_wm_threads = KBL_MAX_THREADS_PER_PSD * 6,
+   .num_slices = 2,
 };
 
 static const struct brw_device_info brw_device_info_kbl_gt4 = {
@@ -460,6 +485,7 @@ static const struct brw_device_info brw_device_info_kbl_gt4 = {
     *  will be used."
     */
    .urb.size = 1008 / 3,
+   .num_slices = 3,
 };
 
 const struct brw_device_info *