[Mesa-stable] [PATCH] i965/skl: Add production thread counts and URB size

[Ben Widawsky]

This patch adjusts the SKL values to the best known values we have. It also adds
the missing HS/DS/CS fields. To support this patch I needed to add some default
values to BXT. Those values are just minimal values which we can use for
enabling.

Note to backporter: You can drop the BXT change (second hunk) entirely.

Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
---
 src/mesa/drivers/dri/i965/brw_device_info.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c b/src/mesa/drivers/dri/i965/brw_device_info.c
index 6fe6ea2..066dac6 100644
--- a/src/mesa/drivers/dri/i965/brw_device_info.c
+++ b/src/mesa/drivers/dri/i965/brw_device_info.c
@@ -308,13 +308,18 @@ static const struct brw_device_info brw_device_info_chv = {
    .has_llc = true,                                 \
    .has_pln = true,                                 \
    .supports_simd16_3src = true,                    \
-   .max_vs_threads = 280,                           \
-   .max_gs_threads = 256,                           \
-   .max_wm_threads = 408,                           \
+   .max_vs_threads = 336,                           \
+   .max_hs_threads = 336,                           \
+   .max_ds_threads = 336,                           \
+   .max_gs_threads = 336,                           \
+   .max_wm_threads = 64 * 6,                        \
+   .max_cs_threads = 56,                            \
    .urb = {                                         \
-      .size = 128,                                  \
+      .size = 192,                                  \
       .min_vs_entries = 64,                         \
-      .max_vs_entries = 1664,                       \
+      .max_vs_entries = 1856,                       \
+      .max_hs_entries = 672,                        \
+      .max_ds_entries = 1120,                       \
       .max_gs_entries = 640,                        \
    }
 
@@ -341,12 +346,17 @@ static const struct brw_device_info brw_device_info_bxt = {
    .gt = 1,
    .has_llc = false,
    .max_vs_threads = 112,
+   .max_hs_threads = 112,
+   .max_ds_threads = 112,
    .max_gs_threads = 112,
    .max_wm_threads = 32,
+   .max_cs_threads = 28,
    .urb = {
       .size = 64,
       .min_vs_entries = 34,
       .max_vs_entries = 640,
+      .max_hs_entries = 80,
+      .max_ds_entries = 80,
       .max_gs_entries = 256,
    }
 };
-- 
2.5.0