From mboxrd@z Thu Jan 1 00:00:00 1970 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 ABF32CCD194 for ; Wed, 15 Oct 2025 03:17:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 633BE10E6E5; Wed, 15 Oct 2025 03:17:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="am4C/uEx"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A55710E6E9 for ; Wed, 15 Oct 2025 03:17:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760498233; x=1792034233; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y1mYA/fM2/OYPZxkeuwepHULZUjd4UZgxkQRZR/qVPE=; b=am4C/uExafO9OmJBGD7EfPAUjhC6q0x2iDRZwwTw/rPV3neYMFMu5/KS b8p60Z9rT8hsZ+JaT61O3rXwxiljC7BysrVmK3cICkqkjQF3QQtS44043 iembCrj1zuLQAMDC80I6KOOMS9EliadfZXuBrL27jvtfTvhaYmhDn/Z/3 2EvTkVvoZP7ALikxGuNpO/Rs0n0zyKsbwNYaQIgmk4GoAhACKDDFLwtdb 3pE9jhn2aadtpWLvTIEFLJCdK5dNmNDSclLRE00jqB8ZGPKo48ww8zCMC AmCWccuxxQXI41AQdPn81Zv55H+geh6pPm65OEtd3AXDUFzxzXaAAZGBb g==; X-CSE-ConnectionGUID: f0OxyqcEQH2zlTw4FdSEEA== X-CSE-MsgGUID: H3tt7en1R06zJFdxbZZiHA== X-IronPort-AV: E=McAfee;i="6800,10657,11531"; a="62577183" X-IronPort-AV: E=Sophos;i="6.17,312,1747724400"; d="scan'208";a="62577183" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2025 20:17:12 -0700 X-CSE-ConnectionGUID: gRNBQA90Rg263xcR0ITV1Q== X-CSE-MsgGUID: ON3a1rMRS6SsNd/eAuAoNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,230,1754982000"; d="scan'208";a="186302560" Received: from dut6304bmgfrd.fm.intel.com ([10.36.21.81]) by orviesa004.jf.intel.com with ESMTP; 14 Oct 2025 20:17:12 -0700 From: Xin Wang To: igt-dev@lists.freedesktop.org Cc: Xin Wang Subject: [PATCH v6 2/2] lib/intel_device_info: Query runtime xe device graphics versions Date: Wed, 15 Oct 2025 03:17:09 +0000 Message-ID: <20251015031709.73133-3-x.wang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251015031709.73133-1-x.wang@intel.com> References: <20251015031709.73133-1-x.wang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" For platforms with graphics_ver >= 20, query the runtime xe device ver instead of relying solely on hardcoded values from the PCI device table. This enables accurate IP minor version (graphics_rel) detection for platforms like Xe2 where different steppings have different IP versions. Implementation details: - Use weak symbol linkage for xe_device_get_info() to handle static library compilation (libigt_chipset.a, libigt_device_scan.a) without xe_query.c dependencies which are used for i915 tools (i915_perf and intel_gpu_top) - Provide a weak stub that returns NULL when xe_query is not linked - For Gen20+ platforms, prefer runtime xe device versions over static data - Fall back to PCI table if xe device info is unavailable - Reset cache on query failure to allow retry Remove hardcoded graphics_rel from static table entries for xe devices as they will be populated at runtime from GMD_ID. This unifies device info handling between i915 and xe drivers, enabling: - Platform-specific workarounds based on accurate IP versions - Consistent device info API across both drivers Signed-off-by: Xin Wang --- lib/intel_device_info.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c index a853f9ab4..c97acf49b 100644 --- a/lib/intel_device_info.c +++ b/lib/intel_device_info.c @@ -3,6 +3,16 @@ #include "i915_pciids_local.h" #include /* ffs() */ +#include +#include + +/* Weak symbol stub - will be overridden if xe_query.c is linked */ +struct intel_device_info *xe_device_get_info(uint32_t devid) __attribute__((weak)); + +struct intel_device_info *xe_device_get_info(uint32_t devid) +{ + return NULL; +} static const struct intel_device_info intel_generic_info = { .graphics_ver = 0, @@ -505,7 +515,6 @@ static const struct intel_device_info intel_pontevecchio_info = { static const struct intel_device_info intel_lunarlake_info = { .graphics_ver = 20, - .graphics_rel = 4, .display_ver = 20, .has_4tile = true, .has_flatccs = true, @@ -517,7 +526,6 @@ static const struct intel_device_info intel_lunarlake_info = { static const struct intel_device_info intel_battlemage_info = { .graphics_ver = 20, - .graphics_rel = 1, .display_ver = 14, .has_4tile = true, .has_flatccs = true, @@ -529,7 +537,6 @@ static const struct intel_device_info intel_battlemage_info = { static const struct intel_device_info intel_pantherlake_info = { .graphics_ver = 30, - .graphics_rel = 0, .display_ver = 30, .has_4tile = true, .has_flatccs = true, @@ -675,6 +682,8 @@ const struct intel_device_info *intel_get_device_info(uint16_t devid) { static __thread const struct intel_device_info *cache = &intel_generic_info; static __thread uint16_t cached_devid; + static __thread struct intel_device_info xe_dev_info; + struct intel_device_info *info; int i; if (cached_devid == devid) @@ -689,6 +698,15 @@ const struct intel_device_info *intel_get_device_info(uint16_t devid) cached_devid = devid; cache = (void *)intel_device_match[i].match_data; + if (cache->graphics_ver >= 20) { + info = xe_device_get_info(devid); + if (info && info->graphics_ver == cache->graphics_ver) { + memcpy(&xe_dev_info, cache, sizeof(struct intel_device_info)); + xe_dev_info.graphics_rel = info->graphics_rel; + cache = &xe_dev_info; + } else + cached_devid = 0; + } out: return cache; } -- 2.43.0