[PATCH v6 1/2] lib/xe/xe_query: Get runtime xe device graphics version from GMD_ID

[Xin Wang <x.wang@intel.com>]

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 <x.wang@intel.com>
---
 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