intel: Convert devinfo->urb.min_*_entries into an array.

Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Topi Pohjolainen <[email protected]>

2 files changed, 63 insertions, 30 deletions

diff --git a/src/intel/common/gen_device_info.c b/src/intel/common/gen_device_info.c
index bf5f05dc18a..42677516088 100644
--- a/src/intel/common/gen_device_info.c
+++ b/src/intel/common/gen_device_info.c
@@ -81,7 +81,9 @@ static const struct gen_device_info gen_device_info_snb_gt1 = {
    .max_wm_threads = 40,
    .urb = {
       .size = 32,
-      .min_vs_entries = 24,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]   = 24,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]   = 256,
          [MESA_SHADER_GEOMETRY] = 256,
@@ -103,7 +105,9 @@ static const struct gen_device_info gen_device_info_snb_gt2 = {
    .max_wm_threads = 80,
    .urb = {
       .size = 64,
-      .min_vs_entries = 24,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]   = 24,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]   = 256,
          [MESA_SHADER_GEOMETRY] = 256,
@@ -130,8 +134,10 @@ static const struct gen_device_info gen_device_info_ivb_gt1 = {
    .max_cs_threads = 36,
    .urb = {
       .size = 128,
-      .min_vs_entries = 32,
-      .min_ds_entries = 10,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 32,
+         [MESA_SHADER_TESS_EVAL] = 10,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 512,
          [MESA_SHADER_TESS_CTRL] = 32,
@@ -152,8 +158,10 @@ static const struct gen_device_info gen_device_info_ivb_gt2 = {
    .max_cs_threads = 64,
    .urb = {
       .size = 256,
-      .min_vs_entries = 32,
-      .min_ds_entries = 10,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 32,
+         [MESA_SHADER_TESS_EVAL] = 10,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 704,
          [MESA_SHADER_TESS_CTRL] = 64,
@@ -175,8 +183,10 @@ static const struct gen_device_info gen_device_info_byt = {
    .max_cs_threads = 32,
    .urb = {
       .size = 128,
-      .min_vs_entries = 32,
-      .min_ds_entries = 10,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 32,
+         [MESA_SHADER_TESS_EVAL] = 10,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 512,
          [MESA_SHADER_TESS_CTRL] = 32,
@@ -203,8 +213,10 @@ static const struct gen_device_info gen_device_info_hsw_gt1 = {
    .max_cs_threads = 70,
    .urb = {
       .size = 128,
-      .min_vs_entries = 32,
-      .min_ds_entries = 10,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 32,
+         [MESA_SHADER_TESS_EVAL] = 10,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 640,
          [MESA_SHADER_TESS_CTRL] = 64,
@@ -225,8 +237,10 @@ static const struct gen_device_info gen_device_info_hsw_gt2 = {
    .max_cs_threads = 70,
    .urb = {
       .size = 256,
-      .min_vs_entries = 64,
-      .min_ds_entries = 10,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 64,
+         [MESA_SHADER_TESS_EVAL] = 10,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 1664,
          [MESA_SHADER_TESS_CTRL] = 128,
@@ -247,8 +261,10 @@ static const struct gen_device_info gen_device_info_hsw_gt3 = {
    .max_cs_threads = 70,
    .urb = {
       .size = 512,
-      .min_vs_entries = 64,
-      .min_ds_entries = 10,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 64,
+         [MESA_SHADER_TESS_EVAL] = 10,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 1664,
          [MESA_SHADER_TESS_CTRL] = 128,
@@ -279,8 +295,10 @@ static const struct gen_device_info gen_device_info_bdw_gt1 = {
    .max_cs_threads = 42,
    .urb = {
       .size = 192,
-      .min_vs_entries = 64,
-      .min_ds_entries = 34,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 64,
+         [MESA_SHADER_TESS_EVAL] = 34,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 2560,
          [MESA_SHADER_TESS_CTRL] = 504,
@@ -296,8 +314,10 @@ static const struct gen_device_info gen_device_info_bdw_gt2 = {
    .max_cs_threads = 56,
    .urb = {
       .size = 384,
-      .min_vs_entries = 64,
-      .min_ds_entries = 34,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 64,
+         [MESA_SHADER_TESS_EVAL] = 34,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 2560,
          [MESA_SHADER_TESS_CTRL] = 504,
@@ -313,8 +333,10 @@ static const struct gen_device_info gen_device_info_bdw_gt3 = {
    .max_cs_threads = 56,
    .urb = {
       .size = 384,
-      .min_vs_entries = 64,
-      .min_ds_entries = 34,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 64,
+         [MESA_SHADER_TESS_EVAL] = 34,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 2560,
          [MESA_SHADER_TESS_CTRL] = 504,
@@ -336,8 +358,10 @@ static const struct gen_device_info gen_device_info_chv = {
    .max_cs_threads = 6 * 7,
    .urb = {
       .size = 192,
-      .min_vs_entries = 34,
-      .min_ds_entries = 34,
+      .min_entries = {
+         [MESA_SHADER_VERTEX]    = 34,
+         [MESA_SHADER_TESS_EVAL] = 34,
+      },
       .max_entries = {
          [MESA_SHADER_VERTEX]    = 640,
          [MESA_SHADER_TESS_CTRL] = 80,
@@ -363,8 +387,10 @@ static const struct gen_device_info gen_device_info_chv = {
    .max_cs_threads = 56,                            \
    .urb = {                                         \
       .size = 384,                                  \
-      .min_vs_entries = 64,                         \
-      .min_ds_entries = 34,                         \
+      .min_entries = {                              \
+         [MESA_SHADER_VERTEX]    = 64,              \
+         [MESA_SHADER_TESS_EVAL] = 34,              \
+      },                                            \
       .max_entries = {                              \
          [MESA_SHADER_VERTEX]    = 1856,            \
          [MESA_SHADER_TESS_CTRL] = 672,             \
@@ -386,8 +412,10 @@ static const struct gen_device_info gen_device_info_chv = {
    .max_cs_threads = 6 * 6,                        \
    .urb = {                                        \
       .size = 192,                                 \
-      .min_vs_entries = 34,                        \
-      .min_ds_entries = 34,                        \
+      .min_entries = {                             \
+         [MESA_SHADER_VERTEX]    = 34,             \
+         [MESA_SHADER_TESS_EVAL] = 34,             \
+      },                                           \
       .max_entries = {                             \
          [MESA_SHADER_VERTEX]    = 704,            \
          [MESA_SHADER_TESS_CTRL] = 256,            \
@@ -405,8 +433,10 @@ static const struct gen_device_info gen_device_info_chv = {
    .max_cs_threads = 6 * 6,                        \
    .urb = {                                        \
       .size = 128,                                 \
-      .min_vs_entries = 34,                        \
-      .min_ds_entries = 34,                        \
+      .min_entries = {                             \
+         [MESA_SHADER_VERTEX]    = 34,             \
+         [MESA_SHADER_TESS_EVAL] = 34,             \
+      },                                           \
       .max_entries = {                             \
          [MESA_SHADER_VERTEX]    = 352,            \
          [MESA_SHADER_TESS_CTRL] = 128,            \
diff --git a/src/intel/common/gen_device_info.h b/src/intel/common/gen_device_info.h
index 445addc0838..2c4faf4d0d1 100644
--- a/src/intel/common/gen_device_info.h
+++ b/src/intel/common/gen_device_info.h
@@ -135,8 +135,11 @@ struct gen_device_info
        * urb.size = URB Size (kbytes) / slice count
        */
       unsigned size;
-      unsigned min_vs_entries;
-      unsigned min_ds_entries;
+
+      /**
+       * The minimum number of URB entries.  See the 3DSTATE_URB_<XS> docs.
+       */
+      unsigned min_entries[4];
 
       /**
        * The maximum number of URB entries.  See the 3DSTATE_URB_<XS> docs.