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 41199CCD18E for ; Wed, 15 Oct 2025 06:01:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CCD4210E269; Wed, 15 Oct 2025 06:01:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="X8PGH4xs"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5644A10E26E for ; Wed, 15 Oct 2025 06:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760508107; x=1792044107; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rf7E0Mw84ExG8BXg+QOvZDHr7/Oixy/HiEy5XO0pRNQ=; b=X8PGH4xs3LJKgNWjFiZC220t3pjLbTGt0r3OQGOYNyIECZHEsEuA4Yj1 VUUs1Pjx0+40FquCpnhWGl56sqDY6yuwO+/U76MK7Po0CwNG3/pTdH57x TpW6ErT6Y/+La6+wRJn60wyrKlCIYkpbCqJj4VPgsF9kHqELPERZTzNkj Yd0pOpd98cfbYdmUGW7EK7I/bf1QEERzXnXQEQDVIITJct/PI9EtHx4B7 tUgR/FrbtLuwSFcviHN8tff9r/MDocFspDOC6eeZZMMFv0OUkaRozdRcB c4gY+OP8cZeE+UJqjQvhP9Kqia7VVogIiGuGveqliQe67GTH4a4TLrP77 w==; X-CSE-ConnectionGUID: SMGI5VUrSuyGHF9W09hfrQ== X-CSE-MsgGUID: UQETc6mSTO2iBIgTzkCUFA== X-IronPort-AV: E=McAfee;i="6800,10657,11582"; a="62771431" X-IronPort-AV: E=Sophos;i="6.19,230,1754982000"; d="scan'208";a="62771431" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2025 23:01:47 -0700 X-CSE-ConnectionGUID: 5Us04lrxSJ6V6qlY/Tnq7Q== X-CSE-MsgGUID: R8tm8z/ETlyYGBmGJk4xWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,230,1754982000"; d="scan'208";a="186498981" Received: from dut6304bmgfrd.fm.intel.com ([10.36.21.81]) by fmviesa005.fm.intel.com with ESMTP; 14 Oct 2025 23:01:47 -0700 From: Xin Wang To: igt-dev@lists.freedesktop.org Cc: Xin Wang Subject: [PATCH v7 1/2] lib/xe/xe_query: Get runtime xe device graphics version from GMD_ID Date: Wed, 15 Oct 2025 06:01:43 +0000 Message-ID: <20251015060144.6410-2-x.wang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251015060144.6410-1-x.wang@intel.com> References: <20251015060144.6410-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" Add intel_device_info support to xe_device to store accurate graphics versions retrieved from the GMD_ID ioctl. This allows IGT to query the exact IP version for xe platforms. Key changes: - Add intel_device_info field to xe_device structure - set the graphics versions based on the GMD_ID - Cache device info in global map indexed by devid for efficient lookup - Implement xe_device_get_info() to retrieve cached info by devid - Clean up cached device info entry when xe_device is released Signed-off-by: Xin Wang --- lib/xe/xe_query.c | 33 ++++++++++++++++++++++++++++++++- lib/xe/xe_query.h | 4 ++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c index a89e0b980..b7c9a2bec 100644 --- a/lib/xe/xe_query.c +++ b/lib/xe/xe_query.c @@ -335,6 +335,17 @@ static struct xe_device *find_in_cache(int fd) return xe_dev; } +struct intel_device_info *xe_device_get_info(uint32_t devid) +{ + struct intel_device_info *xe_dev_info; + + pthread_mutex_lock(&cache.cache_mutex); + xe_dev_info = igt_map_search(cache.map, &devid); + pthread_mutex_unlock(&cache.cache_mutex); + + return xe_dev_info; +} + static void xe_device_free(struct xe_device *xe_dev) { free(xe_dev->config); @@ -379,6 +390,21 @@ struct xe_device *xe_device_get(int fd) for (int gt = 0; gt < xe_dev->gt_list->num_gt; gt++) xe_dev->gt_mask |= (1ull << xe_dev->gt_list->gt_list[gt].gt_id); + /* + * Set graphics_ver and graphics_rel based on the main GT's GMD_ID. + * We should use the hardcoded value for the none GMD_ID platforms (ip_ver_major == 0) + */ + for (int gt = 0; gt < xe_dev->gt_list->num_gt; gt++) + if (xe_dev->gt_list->gt_list[gt].type == DRM_XE_QUERY_GT_TYPE_MAIN && + xe_dev->gt_list->gt_list[gt].ip_ver_major) { + igt_debug("Setting graphics_ver to %u and graphics_rel to %u\n", + xe_dev->gt_list->gt_list[gt].ip_ver_major, + xe_dev->gt_list->gt_list[gt].ip_ver_minor); + xe_dev->info.graphics_ver = xe_dev->gt_list->gt_list[gt].ip_ver_major; + xe_dev->info.graphics_rel = xe_dev->gt_list->gt_list[gt].ip_ver_minor; + break; + } + /* Tile IDs may be non-consecutive; keep a mask of valid IDs */ for (int gt = 0; gt < xe_dev->gt_list->num_gt; gt++) xe_dev->tile_mask |= (1ull << xe_dev->gt_list->gt_list[gt].tile_id); @@ -413,6 +439,7 @@ struct xe_device *xe_device_get(int fd) prev = find_in_cache_unlocked(fd); if (!prev) { igt_map_insert(cache.map, &xe_dev->fd, xe_dev); + igt_map_insert(cache.map, &xe_dev->dev_id, &xe_dev->info); } else { xe_device_free(xe_dev); xe_dev = prev; @@ -424,7 +451,11 @@ struct xe_device *xe_device_get(int fd) static void delete_in_cache(struct igt_map_entry *entry) { - xe_device_free((struct xe_device *)entry->data); + struct xe_device *xe_dev = (struct xe_device *)entry->data; + struct igt_map_entry *info_entry = igt_map_search(cache.map, &xe_dev->dev_id); + + igt_map_remove_entry(cache.map, info_entry); + xe_device_free(xe_dev); } /** diff --git a/lib/xe/xe_query.h b/lib/xe/xe_query.h index 715b64e2f..1a261866f 100644 --- a/lib/xe/xe_query.h +++ b/lib/xe/xe_query.h @@ -74,6 +74,9 @@ struct xe_device { /** @dev_id: Device id of xe device */ uint16_t dev_id; + + /** @info: Device information for compatibility with i915 */ + struct intel_device_info info; }; #define xe_for_each_engine(__fd, __hwe) \ @@ -140,6 +143,7 @@ int xe_query_pxp_status(int fd); int xe_wait_for_pxp_init(int fd); struct xe_device *xe_device_get(int fd); +struct intel_device_info *xe_device_get_info(uint32_t devid); void xe_device_put(int fd); #endif /* XE_QUERY_H */ -- 2.43.0