From patchwork Mon Aug 19 18:44:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13768866 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B5EA4C5320E for ; Mon, 19 Aug 2024 18:44:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3773610E209; Mon, 19 Aug 2024 18:44:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Wih6nYp3"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id E9BDA10E209; Mon, 19 Aug 2024 18:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724093089; x=1755629089; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FKNiqyu/zSOYCXp0wsZsuTnIGutHzZbxJyxXUXVLs2M=; b=Wih6nYp3awSjGqBidF5c2cXx/jCEGkC1zmvRzEbVSErUuEy4HKeTELvf kylvWkPP9NHbH4kgEQ3nCb3hu7Rj5neQs+i06LmE5HhIpN90XppXR2oR2 gxgzF2WL0u1MNiZFfXHNxxhbx9dReNvZcQw3in8dHK93ne99K2aFpQRxj HBO2e50FrTPjagVxYgM/9Vf+sU+MBsyaMcenGGcfWCnV2mQ5FxGxV+7U8 gLugcKkXfkgplQNJk1SJWOgwT7G1906qJkn7skWqUXT0PBZakzTybPd3J bsYkJ6Nbf+ZG3lDdDpqjJVzGU/GSrQkF6pEBR5sPTZJwiYf3v47RYyiFd Q==; X-CSE-ConnectionGUID: 43c/aNKkS3S642p/JZwUwg== X-CSE-MsgGUID: drL8G17rST6i9aPhQODshw== X-IronPort-AV: E=McAfee;i="6700,10204,11169"; a="26157481" X-IronPort-AV: E=Sophos;i="6.10,159,1719903600"; d="scan'208";a="26157481" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2024 11:44:49 -0700 X-CSE-ConnectionGUID: 8gM4HLwtQu+iR9lKSCpVTg== X-CSE-MsgGUID: S1uqbX/MQcKTCk5ENy6UjA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,159,1719903600"; d="scan'208";a="97940264" Received: from mwiniars-desk2.ger.corp.intel.com (HELO localhost) ([10.245.246.70]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2024 11:44:46 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, rodrigo.vivi@intel.com, lucas.demarchi@intel.com, ville.syrjala@linux.intel.com Subject: [PATCH v2 1/9] drm/i915/display: use a macro to initialize subplatforms Date: Mon, 19 Aug 2024 21:44:28 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Make it easier to change the underlying structures by using a macro similar to PLATFORM() for initialization. The subplatform names in debug logs change slightly as they now reflect the enum rather than manually entered names. For example, RAPTORLAKE_S rather than RPL-S. Reviewed-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- .../drm/i915/display/intel_display_device.c | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index a31f89df2c0a..7bb7348b96d8 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -26,6 +26,10 @@ struct subplatform_desc { const u16 *pciidlist; }; +#define SUBPLATFORM(_platform, _subplatform) \ + .subplatform = (INTEL_DISPLAY_##_platform##_##_subplatform), \ + .name = #_subplatform + struct platform_desc { enum intel_display_platform platform; const char *name; @@ -485,8 +489,8 @@ static const u16 hsw_ulx_ids[] = { static const struct platform_desc hsw_desc = { PLATFORM(HASWELL), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_HASWELL_ULT, "ULT", hsw_ult_ids }, - { INTEL_DISPLAY_HASWELL_ULX, "ULX", hsw_ulx_ids }, + { SUBPLATFORM(HASWELL, ULT), .pciidlist = hsw_ult_ids }, + { SUBPLATFORM(HASWELL, ULX), .pciidlist = hsw_ulx_ids }, {}, }, .info = &(const struct intel_display_device_info) { @@ -529,8 +533,8 @@ static const u16 bdw_ulx_ids[] = { static const struct platform_desc bdw_desc = { PLATFORM(BROADWELL), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_BROADWELL_ULT, "ULT", bdw_ult_ids }, - { INTEL_DISPLAY_BROADWELL_ULX, "ULX", bdw_ulx_ids }, + { SUBPLATFORM(BROADWELL, ULT), .pciidlist = bdw_ult_ids }, + { SUBPLATFORM(BROADWELL, ULX), .pciidlist = bdw_ulx_ids }, {}, }, .info = &(const struct intel_display_device_info) { @@ -613,8 +617,8 @@ static const u16 skl_ulx_ids[] = { static const struct platform_desc skl_desc = { PLATFORM(SKYLAKE), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_SKYLAKE_ULT, "ULT", skl_ult_ids }, - { INTEL_DISPLAY_SKYLAKE_ULX, "ULX", skl_ulx_ids }, + { SUBPLATFORM(SKYLAKE, ULT), .pciidlist = skl_ult_ids }, + { SUBPLATFORM(SKYLAKE, ULX), .pciidlist = skl_ulx_ids }, {}, }, .info = &skl_display, @@ -637,8 +641,8 @@ static const u16 kbl_ulx_ids[] = { static const struct platform_desc kbl_desc = { PLATFORM(KABYLAKE), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_KABYLAKE_ULT, "ULT", kbl_ult_ids }, - { INTEL_DISPLAY_KABYLAKE_ULX, "ULX", kbl_ulx_ids }, + { SUBPLATFORM(KABYLAKE, ULT), .pciidlist = kbl_ult_ids }, + { SUBPLATFORM(KABYLAKE, ULX), .pciidlist = kbl_ulx_ids }, {}, }, .info = &skl_display, @@ -661,8 +665,8 @@ static const u16 cfl_ulx_ids[] = { static const struct platform_desc cfl_desc = { PLATFORM(COFFEELAKE), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_COFFEELAKE_ULT, "ULT", cfl_ult_ids }, - { INTEL_DISPLAY_COFFEELAKE_ULX, "ULX", cfl_ulx_ids }, + { SUBPLATFORM(COFFEELAKE, ULT), .pciidlist = cfl_ult_ids }, + { SUBPLATFORM(COFFEELAKE, ULX), .pciidlist = cfl_ulx_ids }, {}, }, .info = &skl_display, @@ -677,7 +681,7 @@ static const u16 cml_ult_ids[] = { static const struct platform_desc cml_desc = { PLATFORM(COMETLAKE), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_COMETLAKE_ULT, "ULT", cml_ult_ids }, + { SUBPLATFORM(COMETLAKE, ULT), .pciidlist = cml_ult_ids }, {}, }, .info = &skl_display, @@ -776,7 +780,7 @@ static const u16 icl_port_f_ids[] = { static const struct platform_desc icl_desc = { PLATFORM(ICELAKE), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_ICELAKE_PORT_F, "Port F", icl_port_f_ids }, + { SUBPLATFORM(ICELAKE, PORT_F), .pciidlist = icl_port_f_ids }, {}, }, .info = &(const struct intel_display_device_info) { @@ -853,7 +857,7 @@ static const u16 tgl_uy_ids[] = { static const struct platform_desc tgl_desc = { PLATFORM(TIGERLAKE), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_TIGERLAKE_UY, "UY", tgl_uy_ids }, + { SUBPLATFORM(TIGERLAKE, UY), .pciidlist = tgl_uy_ids }, {}, }, .info = &(const struct intel_display_device_info) { @@ -902,7 +906,7 @@ static const u16 adls_rpls_ids[] = { static const struct platform_desc adl_s_desc = { PLATFORM(ALDERLAKE_S), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_ALDERLAKE_S_RAPTORLAKE_S, "RPL-S", adls_rpls_ids }, + { SUBPLATFORM(ALDERLAKE_S, RAPTORLAKE_S), .pciidlist = adls_rpls_ids }, {}, }, .info = &(const struct intel_display_device_info) { @@ -989,9 +993,9 @@ static const u16 adlp_rplp_ids[] = { static const struct platform_desc adl_p_desc = { PLATFORM(ALDERLAKE_P), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_ALDERLAKE_P_ALDERLAKE_N, "ADL-N", adlp_adln_ids }, - { INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_U, "RPL-U", adlp_rplu_ids }, - { INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_P, "RPL-P", adlp_rplp_ids }, + { SUBPLATFORM(ALDERLAKE_P, ALDERLAKE_N), .pciidlist = adlp_adln_ids }, + { SUBPLATFORM(ALDERLAKE_P, RAPTORLAKE_U), .pciidlist = adlp_rplu_ids }, + { SUBPLATFORM(ALDERLAKE_P, RAPTORLAKE_P), .pciidlist = adlp_rplp_ids }, {}, }, .info = &xe_lpd_display, @@ -1026,9 +1030,9 @@ static const u16 dg2_g12_ids[] = { static const struct platform_desc dg2_desc = { PLATFORM(DG2), .subplatforms = (const struct subplatform_desc[]) { - { INTEL_DISPLAY_DG2_G10, "G10", dg2_g10_ids }, - { INTEL_DISPLAY_DG2_G11, "G11", dg2_g11_ids }, - { INTEL_DISPLAY_DG2_G12, "G12", dg2_g12_ids }, + { SUBPLATFORM(DG2, G10), .pciidlist = dg2_g10_ids }, + { SUBPLATFORM(DG2, G11), .pciidlist = dg2_g11_ids }, + { SUBPLATFORM(DG2, G12), .pciidlist = dg2_g12_ids }, {}, }, .info = &xe_hpd_display,