From: Gustavo Sousa Date: Fri, 21 Feb 2025 18:51:43 +0000 (-0300) Subject: drm/xe: Define xe_ip instances before xe_device_desc X-Git-Tag: v6.15-rc1~120^2~10^2~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=871d9c1f3f8ef17f8d19e0dabf5bb7a02dcdbf58;p=thirdparty%2Fkernel%2Flinux.git drm/xe: Define xe_ip instances before xe_device_desc We will soon update the code so that pre-GMDID IPs are also defined with struct xe_ip. Since we will need to refer to them in instances of struct xe_device_desc, let's move up the current instances of xe_ip (GMDID-based) so that all IP descriptors are kept together. Signed-off-by: Gustavo Sousa Reviewed-by: Matt Roper Link: https://patchwork.freedesktop.org/patch/msgid/20250221-xe-unify-ip-descriptors-v2-4-5bc0c6d0c13f@intel.com Signed-off-by: Matt Roper --- diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index 6f5bf343fe863..59beed405bbdd 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -201,6 +201,25 @@ static const struct xe_media_desc media_xelpmp = { BIT(XE_HW_ENGINE_GSCCS0) }; +/* GMDID-based Graphics IPs */ +static const struct xe_ip graphics_ips[] = { + { 1270, "Xe_LPG", &graphics_xelpg }, + { 1271, "Xe_LPG", &graphics_xelpg }, + { 1274, "Xe_LPG+", &graphics_xelpg }, + { 2001, "Xe2_HPG", &graphics_xe2 }, + { 2004, "Xe2_LPG", &graphics_xe2 }, + { 3000, "Xe3_LPG", &graphics_xe2 }, + { 3001, "Xe3_LPG", &graphics_xe2 }, +}; + +/* GMDID-based Media IPs */ +static const struct xe_ip media_ips[] = { + { 1300, "Xe_LPM+", &media_xelpmp }, + { 1301, "Xe2_HPM", &media_xelpmp }, + { 2000, "Xe2_LPM", &media_xelpmp }, + { 3000, "Xe3_LPM", &media_xelpmp }, +}; + static const struct xe_device_desc tgl_desc = { .graphics = &graphics_xelp, .media = &media_xem, @@ -358,25 +377,6 @@ static const struct xe_device_desc ptl_desc = { #undef PLATFORM __diag_pop(); -/* GMDID-based Graphics IPs */ -static const struct xe_ip graphics_ips[] = { - { 1270, "Xe_LPG", &graphics_xelpg }, - { 1271, "Xe_LPG", &graphics_xelpg }, - { 1274, "Xe_LPG+", &graphics_xelpg }, - { 2001, "Xe2_HPG", &graphics_xe2 }, - { 2004, "Xe2_LPG", &graphics_xe2 }, - { 3000, "Xe3_LPG", &graphics_xe2 }, - { 3001, "Xe3_LPG", &graphics_xe2 }, -}; - -/* GMDID-based Media IPs */ -static const struct xe_ip media_ips[] = { - { 1300, "Xe_LPM+", &media_xelpmp }, - { 1301, "Xe2_HPM", &media_xelpmp }, - { 2000, "Xe2_LPM", &media_xelpmp }, - { 3000, "Xe3_LPM", &media_xelpmp }, -}; - /* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem