intel: Use similar brand strings to the Windows drivers

[mesa.git] / src / intel / dev / gen_device_info.c

diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 520b87073a751f0d0a39e0ca98e7199235621583..2b43ce0010b5d31df94338df7cf404b85583d4e3 100644 (file)
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -854,28 +854,28 @@ static const struct gen_device_info gen_device_info_cfl_gt3 = {
    .num_eu_per_subslice = 8,                        \
    .l3_banks = _l3
 
-static const struct gen_device_info gen_device_info_cnl_2x8 = {
+static const struct gen_device_info gen_device_info_cnl_gt0_5 = {
    /* GT0.5 */
    GEN10_FEATURES(1, 1, subslices(2), 2),
    .is_cannonlake = true,
    .simulator_id = 15,
 };
 
-static const struct gen_device_info gen_device_info_cnl_3x8 = {
+static const struct gen_device_info gen_device_info_cnl_gt1 = {
    /* GT1 */
    GEN10_FEATURES(1, 1, subslices(3), 3),
    .is_cannonlake = true,
    .simulator_id = 15,
 };
 
-static const struct gen_device_info gen_device_info_cnl_4x8 = {
+static const struct gen_device_info gen_device_info_cnl_gt1_5 = {
    /* GT 1.5 */
    GEN10_FEATURES(1, 2, subslices(2, 2), 6),
    .is_cannonlake = true,
    .simulator_id = 15,
 };
 
-static const struct gen_device_info gen_device_info_cnl_5x8 = {
+static const struct gen_device_info gen_device_info_cnl_gt2 = {
    /* GT2 */
    GEN10_FEATURES(2, 2, subslices(3, 2), 6),
    .is_cannonlake = true,
@@ -913,7 +913,7 @@ static const struct gen_device_info gen_device_info_cnl_5x8 = {
       [MESA_SHADER_GEOMETRY]  = 1032,                 \
    }
 
-static const struct gen_device_info gen_device_info_icl_8x8 = {
+static const struct gen_device_info gen_device_info_icl_gt2 = {
    GEN11_FEATURES(2, 1, subslices(8), 8),
    .urb = {
       .size = 1024,
@@ -922,7 +922,7 @@ static const struct gen_device_info gen_device_info_icl_8x8 = {
    .simulator_id = 19,
 };
 
-static const struct gen_device_info gen_device_info_icl_6x8 = {
+static const struct gen_device_info gen_device_info_icl_gt1_5 = {
    GEN11_FEATURES(1, 1, subslices(6), 6),
    .urb = {
       .size = 768,
@@ -931,7 +931,7 @@ static const struct gen_device_info gen_device_info_icl_6x8 = {
    .simulator_id = 19,
 };
 
-static const struct gen_device_info gen_device_info_icl_4x8 = {
+static const struct gen_device_info gen_device_info_icl_gt1 = {
    GEN11_FEATURES(1, 1, subslices(4), 6),
    .urb = {
       .size = 768,
@@ -940,7 +940,7 @@ static const struct gen_device_info gen_device_info_icl_4x8 = {
    .simulator_id = 19,
 };
 
-static const struct gen_device_info gen_device_info_icl_1x8 = {
+static const struct gen_device_info gen_device_info_icl_gt0_5 = {
    GEN11_FEATURES(1, 1, subslices(1), 6),
    .urb = {
       .size = 768,
@@ -949,7 +949,7 @@ static const struct gen_device_info gen_device_info_icl_1x8 = {
    .simulator_id = 19,
 };
 
-static const struct gen_device_info gen_device_info_ehl_4x8 = {
+static const struct gen_device_info gen_device_info_ehl_7 = {
    GEN11_FEATURES(1, 1, subslices(4), 4),
    .is_elkhartlake = true,
    .urb = {
@@ -969,7 +969,7 @@ static const struct gen_device_info gen_device_info_ehl_4x8 = {
    .simulator_id = 28,
 };
 
-static const struct gen_device_info gen_device_info_ehl_4x6 = {
+static const struct gen_device_info gen_device_info_ehl_6 = {
    GEN11_FEATURES(1, 1, subslices(4), 4),
    .is_elkhartlake = true,
    .urb = {
@@ -990,7 +990,7 @@ static const struct gen_device_info gen_device_info_ehl_4x6 = {
    .simulator_id = 28,
 };
 
-static const struct gen_device_info gen_device_info_ehl_4x4 = {
+static const struct gen_device_info gen_device_info_ehl_5 = {
    GEN11_FEATURES(1, 1, subslices(4), 4),
    .is_elkhartlake = true,
    .urb = {
@@ -1011,7 +1011,7 @@ static const struct gen_device_info gen_device_info_ehl_4x4 = {
    .simulator_id = 28,
 };
 
-static const struct gen_device_info gen_device_info_ehl_2x4 = {
+static const struct gen_device_info gen_device_info_ehl_4 = {
    GEN11_FEATURES(1, 1, subslices(2), 4),
    .is_elkhartlake = true,
    .urb = {
@@ -1071,11 +1071,11 @@ static const struct gen_device_info gen_device_info_ehl_2x4 = {
 
 #define dual_subslices(args...) { args, }
 
-static const struct gen_device_info gen_device_info_tgl_1x2x16 = {
+static const struct gen_device_info gen_device_info_tgl_gt1 = {
    GEN12_FEATURES(1, 1, dual_subslices(2), 8),
 };
 
-static const struct gen_device_info gen_device_info_tgl_1x6x16 = {
+static const struct gen_device_info gen_device_info_tgl_gt2 = {
    GEN12_FEATURES(2, 1, dual_subslices(6), 8),
 };
 
@@ -1294,7 +1294,7 @@ gen_get_device_info_from_pci_id(int pci_id,
 {
    switch (pci_id) {
 #undef CHIPSET
-#define CHIPSET(id, family, name) \
+#define CHIPSET(id, family, fam_str, name) \
       case id: *devinfo = gen_device_info_##family; break;
 #include "pci_ids/i965_pci_ids.h"
 #include "pci_ids/iris_pci_ids.h"
@@ -1348,7 +1348,7 @@ gen_get_device_name(int devid)
 {
    switch (devid) {
 #undef CHIPSET
-#define CHIPSET(id, family, name) case id: return name;
+#define CHIPSET(id, family, fam_str, name) case id: return name " (" fam_str ")"; break;
 #include "pci_ids/i965_pci_ids.h"
 #include "pci_ids/iris_pci_ids.h"
    default: