Unverified Commit 7e5161da authored by Ashutosh Dixit's avatar Ashutosh Dixit Committed by Rodrigo Vivi
Browse files

drm/xe/oa: Fix kernel doc in xe_drm.h 



Fix kernel doc in xe_drm.h. Also eliminate private/non-abi enum
definitions.

v2: Remove __DRM_XE_PERF_TYPE_MAX since it is unused (Michal)
v3: Also remove DRM_XE_OA_PROPERTY_MAX since it can also be
    eliminated (Michal)

Suggested-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240623203119.3840283-1-ashutosh.dixit@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 701d9c4a

drivers/gpu/drm/xe/xe_oa.c

+2 −1
Original line number Diff line number Diff line
@@ -1684,6 +1684,7 @@ static const xe_oa_user_extension_fn xe_oa_user_extension_funcs[] = { 
	[DRM_XE_OA_EXTENSION_SET_PROPERTY] = xe_oa_user_ext_set_property,

};



#define MAX_USER_EXTENSIONS	16

static int xe_oa_user_extensions(struct xe_oa *oa, u64 extension, int ext_number,

				 struct xe_oa_open_param *param)

{
@@ -1692,7 +1693,7 @@ static int xe_oa_user_extensions(struct xe_oa *oa, u64 extension, int ext_number 
	int err;

	u32 idx;



	if (XE_IOCTL_DBG(oa->xe, ext_number >= DRM_XE_OA_PROPERTY_MAX))

	if (XE_IOCTL_DBG(oa->xe, ext_number >= MAX_USER_EXTENSIONS))

		return -E2BIG;



	err = __copy_from_user(&ext, address, sizeof(ext));

include/uapi/drm/xe_drm.h

+1 −4
Original line number Diff line number Diff line
@@ -1379,8 +1379,8 @@ struct drm_xe_wait_user_fence { 
 * enum drm_xe_perf_type - Perf stream types

 */

enum drm_xe_perf_type {

	/** @DRM_XE_PERF_TYPE_OA: OA perf stream type */

	DRM_XE_PERF_TYPE_OA,

	__DRM_XE_PERF_TYPE_MAX, /* non-ABI */

};



/**
@@ -1611,9 +1611,6 @@ enum drm_xe_oa_property_id { 
	 * pass along with @DRM_XE_OA_PROPERTY_EXEC_QUEUE_ID or will default to 0.

	 */

	DRM_XE_OA_PROPERTY_OA_ENGINE_INSTANCE,



	/** @DRM_XE_OA_PROPERTY_MAX: non-ABI */

	DRM_XE_OA_PROPERTY_MAX

};



/**