From 7cb2ace465792e5f503c919bce8024bb10802125 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Thu, 9 Jul 2020 15:15:13 -0700 Subject: [PATCH] intel/ehl: Rename gen_device_info struct Renaming makes it easier to relate a pciid with device configuration. Signed-off-by: Anuj Phogat Reviewed-by: Lionel Landwerlin --- include/pci_ids/i965_pci_ids.h | 14 +++++++------- src/intel/dev/gen_device_info.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h index 903f550ba2a..d727bc0a8c0 100644 --- a/include/pci_ids/i965_pci_ids.h +++ b/include/pci_ids/i965_pci_ids.h @@ -257,11 +257,11 @@ CHIPSET(0x8A5C, icl_gt1_5, "ICL GT1.5", "Intel(R) Iris(R) Plus Graphics") CHIPSET(0x8A5D, icl_gt1, "ICL GT1", "Intel(R) HD Graphics") CHIPSET(0x8A71, icl_gt0_5, "ICL GT0.5", "Intel(R) HD Graphics") -CHIPSET(0x4500, ehl_7, "EHL", "Intel(R) UHD Graphics") -CHIPSET(0x4571, ehl_7, "EHL", "Intel(R) UHD Graphics") -CHIPSET(0x4551, ehl_5, "EHL", "Intel(R) UHD Graphics") -CHIPSET(0x4541, ehl_4, "EHL", "Intel(R) UHD Graphics") -CHIPSET(0x4E51, ehl_5, "JSL", "Intel(R) UHD Graphics") -CHIPSET(0x4E61, ehl_6, "JSL", "Intel(R) UHD Graphics") -CHIPSET(0x4E71, ehl_7, "JSL", "Intel(R) UHD Graphics") +CHIPSET(0x4500, ehl_4x8, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4541, ehl_2x4, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4551, ehl_4x4, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4571, ehl_4x8, "EHL", "Intel(R) UHD Graphics") +CHIPSET(0x4E51, ehl_4x4, "JSL", "Intel(R) UHD Graphics") +CHIPSET(0x4E61, ehl_4x6, "JSL", "Intel(R) UHD Graphics") +CHIPSET(0x4E71, ehl_4x8, "JSL", "Intel(R) UHD Graphics") #endif diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c index 4d5b5de68ea..10231c60a40 100644 --- a/src/intel/dev/gen_device_info.c +++ b/src/intel/dev/gen_device_info.c @@ -918,24 +918,24 @@ static const struct gen_device_info gen_device_info_icl_gt0_5 = { .disable_ccs_repack = true, \ .simulator_id = 28 -static const struct gen_device_info gen_device_info_ehl_7 = { +static const struct gen_device_info gen_device_info_ehl_4x8 = { GEN11_FEATURES(1, 1, subslices(4), 4), GEN11_LP_FEATURES, }; -static const struct gen_device_info gen_device_info_ehl_6 = { +static const struct gen_device_info gen_device_info_ehl_4x6 = { GEN11_FEATURES(1, 1, subslices(4), 4), GEN11_LP_FEATURES, .num_eu_per_subslice = 6, }; -static const struct gen_device_info gen_device_info_ehl_5 = { +static const struct gen_device_info gen_device_info_ehl_4x4 = { GEN11_FEATURES(1, 1, subslices(4), 4), GEN11_LP_FEATURES, .num_eu_per_subslice = 4, }; -static const struct gen_device_info gen_device_info_ehl_4 = { +static const struct gen_device_info gen_device_info_ehl_2x4 = { GEN11_FEATURES(1, 1, subslices(2), 4), GEN11_LP_FEATURES, .num_eu_per_subslice =4, -- 2.30.2