Re: [PATCH v2 2/5] drm/xe/oa/uapi: Add gt_id to struct drm_xe_oa_unit

[Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>]

On Tue, Dec 02, 2025 at 02:27:16PM -0800, Umesh Nerlige Ramappa wrote:
>On Mon, Dec 01, 2025 at 06:51:12PM -0800, Ashutosh Dixit wrote:
>>gt_id was previously omitted from 'struct drm_xe_oa_unit' because it could
>>be determine from hwe's attached to the OA unit. However, we now have OA
>>units which don't have any hwe's attached to them. Hence add gt_id to
>>'struct drm_xe_oa_unit' in order to provide this needed information to
>>userspace.
>>
>>Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
>>Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
>>---
>>v2: Change gt_id to u16 (Matt Brost)
>>---
>>drivers/gpu/drm/xe/xe_query.c | 4 +++-
>>include/uapi/drm/xe_drm.h     | 9 ++++++++-
>>2 files changed, 11 insertions(+), 2 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
>>index a7bf1fd6dd6ac..18bd8047ebfdb 100644
>>--- a/drivers/gpu/drm/xe/xe_query.c
>>+++ b/drivers/gpu/drm/xe/xe_query.c
>>@@ -682,7 +682,9 @@ static int query_oa_units(struct xe_device *xe,
>>			du->capabilities = DRM_XE_OA_CAPS_BASE | DRM_XE_OA_CAPS_SYNCS |
>>					   DRM_XE_OA_CAPS_OA_BUFFER_SIZE |
>>					   DRM_XE_OA_CAPS_WAIT_NUM_REPORTS |
>>-					   DRM_XE_OA_CAPS_OAM;
>>+					   DRM_XE_OA_CAPS_OAM |
>>+					   DRM_XE_OA_CAPS_OA_UNIT_GT_ID;
>>+			du->gt_id = u->gt->info.id;
>>			j = 0;
>>			for_each_hw_engine(hwe, gt, hwe_id) {
>>				if (!xe_hw_engine_is_reserved(hwe) &&
>>diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
>>index 37881b1eb6bad..4413c7f918740 100644
>>--- a/include/uapi/drm/xe_drm.h
>>+++ b/include/uapi/drm/xe_drm.h
>>@@ -1681,12 +1681,19 @@ struct drm_xe_oa_unit {
>>#define DRM_XE_OA_CAPS_OA_BUFFER_SIZE	(1 << 2)
>>#define DRM_XE_OA_CAPS_WAIT_NUM_REPORTS	(1 << 3)
>>#define DRM_XE_OA_CAPS_OAM		(1 << 4)
>>+#define DRM_XE_OA_CAPS_OA_UNIT_GT_ID	(1 << 5)
>>
>>	/** @oa_timestamp_freq: OA timestamp freq */
>>	__u64 oa_timestamp_freq;
>>
>>+	/** @gt_id: gt id for this OA unit */
>>+	__u16 gt_id;
>>+
>>+	/** @reserved1: MBZ */
>>+	__u16 reserved1[3];
>>+
>>	/** @reserved: MBZ */
>>-	__u64 reserved[4];
>>+	__u64 reserved[3];
>
>Maybe I missed this in earlier reviews, AFAIR, we should ensure the 
>MBZ part in the implementation (i.e. check that reserved fields are 
>zero when validating the params). Not sure if things changed with Xe 
>KMD.

Please ignore, since this is output data.

Thanks,
Umesh
>
>Regards,
>Umesh
>>
>>	/** @num_engines: number of engines in @eci array */
>>	__u64 num_engines;
>>-- 
>>2.48.1
>>