Module: Mesa Branch: main Commit: abf8b47e0282690937c81e19983e43ddca4fb979 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=abf8b47e0282690937c81e19983e43ddca4fb979
Author: Jordan Justen <jordan.l.jus...@intel.com> Date: Tue Oct 17 14:56:05 2023 -0700 intel/dev: Rename mtl-p to mtl-h Ref: bspec 55414 Suggested-by: José Roberto de Souza <jose.so...@intel.com> Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> Reviewed-by: Sagar Ghuge <sagar.gh...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25857> --- include/pci_ids/iris_pci_ids.h | 6 ++-- src/intel/dev/gen_wa_helpers.py | 2 +- src/intel/dev/intel_device_info.c | 4 +-- src/intel/dev/intel_device_info.h | 2 +- src/intel/dev/mesa_defs.json | 74 +++++++++++++++++++-------------------- src/intel/perf/intel_perf.c | 2 +- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/include/pci_ids/iris_pci_ids.h b/include/pci_ids/iris_pci_ids.h index ec4ceb3cebf..46bbe20f6e8 100644 --- a/include/pci_ids/iris_pci_ids.h +++ b/include/pci_ids/iris_pci_ids.h @@ -253,7 +253,7 @@ CHIPSET(0x56c0, atsm_g10, "ATS-M", "Intel(R) Data Center GPU Flex Series 170 Gra CHIPSET(0x56c1, atsm_g11, "ATS-M", "Intel(R) Data Center GPU Flex Series 140 Graphics") CHIPSET(0x7d40, mtl_u, "MTL", "Intel(R) Graphics") -CHIPSET(0x7d45, mtl_p, "MTL", "Intel(R) Graphics") -CHIPSET(0x7d55, mtl_p, "MTL", "Intel(R) Arc(tm) Graphics") +CHIPSET(0x7d45, mtl_h, "MTL", "Intel(R) Graphics") +CHIPSET(0x7d55, mtl_h, "MTL", "Intel(R) Arc(tm) Graphics") CHIPSET(0x7d60, mtl_u, "MTL", "Intel(R) Graphics") -CHIPSET(0x7dd5, mtl_p, "MTL", "Intel(R) Graphics") +CHIPSET(0x7dd5, mtl_h, "MTL", "Intel(R) Graphics") diff --git a/src/intel/dev/gen_wa_helpers.py b/src/intel/dev/gen_wa_helpers.py index e69d3ab63e2..6aeacd7b860 100644 --- a/src/intel/dev/gen_wa_helpers.py +++ b/src/intel/dev/gen_wa_helpers.py @@ -202,7 +202,7 @@ _PLATFORM_GFXVERS = {"INTEL_PLATFORM_BDW" : 80, "INTEL_PLATFORM_DG2_G11" : 125, "INTEL_PLATFORM_DG2_G12" : 125, "INTEL_PLATFORM_MTL_U" : 125, - "INTEL_PLATFORM_MTL_P" : 125, + "INTEL_PLATFORM_MTL_H" : 125, } def macro_versions(wa_def): diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c index f33d9c06446..015b6dbd392 100644 --- a/src/intel/dev/intel_device_info.c +++ b/src/intel/dev/intel_device_info.c @@ -1147,9 +1147,9 @@ static const struct intel_device_info intel_device_info_mtl_u = { .platform = INTEL_PLATFORM_MTL_U, }; -static const struct intel_device_info intel_device_info_mtl_p = { +static const struct intel_device_info intel_device_info_mtl_h = { MTL_FEATURES, - .platform = INTEL_PLATFORM_MTL_P, + .platform = INTEL_PLATFORM_MTL_H, }; void diff --git a/src/intel/dev/intel_device_info.h b/src/intel/dev/intel_device_info.h index 5c13377caf8..b1e98231957 100644 --- a/src/intel/dev/intel_device_info.h +++ b/src/intel/dev/intel_device_info.h @@ -80,7 +80,7 @@ enum intel_platform { INTEL_PLATFORM_GROUP_START(ATSM, INTEL_PLATFORM_ATSM_G10), INTEL_PLATFORM_GROUP_END(ATSM, INTEL_PLATFORM_ATSM_G11), INTEL_PLATFORM_GROUP_START(MTL, INTEL_PLATFORM_MTL_U), - INTEL_PLATFORM_GROUP_END(MTL, INTEL_PLATFORM_MTL_P), + INTEL_PLATFORM_GROUP_END(MTL, INTEL_PLATFORM_MTL_H), INTEL_PLATFORM_LNL, }; diff --git a/src/intel/dev/mesa_defs.json b/src/intel/dev/mesa_defs.json index a6c85678b42..1e382a94534 100644 --- a/src/intel/dev/mesa_defs.json +++ b/src/intel/dev/mesa_defs.json @@ -574,7 +574,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015981040 ], @@ -1376,7 +1376,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14014488340 ], @@ -1533,7 +1533,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14014081338 ], @@ -1645,7 +1645,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14014211894 ], @@ -1707,7 +1707,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015168016 ], @@ -1782,7 +1782,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 22013683737 ], @@ -1817,7 +1817,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015322178 ], @@ -1860,7 +1860,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14018019666 ], @@ -1913,7 +1913,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 22014125355 ], @@ -1948,7 +1948,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015816823 ], @@ -1976,7 +1976,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015876495 ], @@ -2073,7 +2073,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14016250767 ], @@ -2096,7 +2096,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14017068294 ], @@ -2118,7 +2118,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14016769435 ], @@ -2151,7 +2151,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14017353530 ], @@ -2167,7 +2167,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14017245111, 14017341140 @@ -2217,7 +2217,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14017468336, 14017517122 @@ -2327,7 +2327,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14018953713 ], @@ -2380,7 +2380,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14019028097, 14019100030 @@ -2416,7 +2416,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14016829388 ], @@ -2659,7 +2659,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015522645 ], @@ -2703,7 +2703,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 16013063651 ], @@ -2753,7 +2753,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14016880026 ], @@ -2808,7 +2808,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015846240 ], @@ -2842,7 +2842,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015231253 ], @@ -2898,7 +2898,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14016272709 ], @@ -2920,7 +2920,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14017544764 ], @@ -2992,7 +2992,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14013842739 ], @@ -3042,7 +3042,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015846243 ], @@ -3119,7 +3119,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015592699 ], @@ -3154,7 +3154,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14015853533 ], @@ -3189,7 +3189,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14016768589 ], @@ -3265,7 +3265,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 18022330953, 22015761040 @@ -3348,7 +3348,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14017094742 ], @@ -3404,7 +3404,7 @@ ], "steppings": "all" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14017889159 ], @@ -3595,7 +3595,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14014909922 ], @@ -3652,7 +3652,7 @@ ], "steppings": "a0..b0" }, - "INTEL_PLATFORM_MTL_P": { + "INTEL_PLATFORM_MTL_H": { "ids": [ 14016120505 ], diff --git a/src/intel/perf/intel_perf.c b/src/intel/perf/intel_perf.c index ea89f8ecfe7..8e11a64d338 100644 --- a/src/intel/perf/intel_perf.c +++ b/src/intel/perf/intel_perf.c @@ -490,7 +490,7 @@ get_register_queries_function(const struct intel_device_info *devinfo) case INTEL_PLATFORM_DG2_G12: return intel_oa_register_queries_acmgt2; case INTEL_PLATFORM_MTL_U: - case INTEL_PLATFORM_MTL_P: + case INTEL_PLATFORM_MTL_H: if (intel_device_info_eu_total(devinfo) <= 64) return intel_oa_register_queries_mtlgt2; if (intel_device_info_eu_total(devinfo) <= 128)
