History

drm/xe/uapi: Fix wrong names and references in xe_drm.h

Fix incorrect field names, struct names, ioctl names, and descriptions in doc comments: - probed_size -> @cpu_visible_size (correct field name) - @flags description was copy of @placement -> fix to reference DRM_XE_GEM_CREATE_FLAG_* - %XE_PXP_HWDRM_DEFAULT_SESSION -> %DRM_XE_PXP_HWDRM_DEFAULT_SESSION (missing DRM_ prefix) - Remove undefined %DRM_XE_UFENCE_WAIT_FLAG_SOFT_OP - &DRM_XE_OBSERVATION -> &DRM_IOCTL_XE_OBSERVATION - id's/struct's -> IDs/structs (fix incorrect possessive forms) - drm_xe_query_oa_units -> drm_xe_oa_unit - DRM_IOCTL_XE_VM_QUERY_MEM_RANGES_ATTRS -> DRM_IOCTL_XE_VM_QUERY_MEM_RANGE_ATTRS - DRM_IOCTL_XE_VM_QUERY_MEM_ATTRIBUTES -> DRM_IOCTL_XE_VM_QUERY_MEM_RANGE_ATTRS - @sizeof_mem_ranges_attr -> @sizeof_mem_range_attr - @vector_of_vma_mem_attr -> @vector_of_mem_attr v3: id -> ID. (Xin) split cross-reference fix to seperate patch.

Shuicheng Lin committed 7 months ago

Commit ea842c21 parent 65d53c11 file · +12 −14Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/drm/xe_drm.h+12−14
@@ -349,7 +349,7 @@ struct drm_xe_mem_region { · 348 unmodified lines
349 * is smaller than @total_size then this is referred to as a349 * is smaller than @total_size then this is referred to as a
350 * small BAR system.350 * small BAR system.
351 *351 *
352 * On systems without small BAR (full BAR), the probed_size will352 * On systems without small BAR (full BAR), the @cpu_visible_size will
353 * always equal the @total_size, since all of it will be CPU353 * always equal the @total_size, since all of it will be CPU
354 * accessible.354 * accessible.
355 *355 *
@@ -862,8 +862,7 @@ struct drm_xe_gem_create { · 506 unmodified lines
862#define DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM (1 << 2)862#define DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM (1 << 2)
863#define DRM_XE_GEM_CREATE_FLAG_NO_COMPRESSION (1 << 3)863#define DRM_XE_GEM_CREATE_FLAG_NO_COMPRESSION (1 << 3)
864 /**864 /**
865 * @flags: Flags, currently a mask of memory instances of where BO can865 * @flags: Flags for the GEM object, see DRM_XE_GEM_CREATE_FLAG_*
866 * be placed
867 */866 */
868 __u32 flags;867 __u32 flags;
869 868
@@ -1366,7 +1365,7 @@ struct drm_xe_vm_get_property { · 496 unmodified lines
1366 * drm_xe_pxp_session_type. %DRM_XE_PXP_TYPE_NONE is the default behavior, so1365 * drm_xe_pxp_session_type. %DRM_XE_PXP_TYPE_NONE is the default behavior, so
1367 * there is no need to explicitly set that. When a queue of type1366 * there is no need to explicitly set that. When a queue of type
1368 * %DRM_XE_PXP_TYPE_HWDRM is created, the PXP default HWDRM session1367 * %DRM_XE_PXP_TYPE_HWDRM is created, the PXP default HWDRM session
1369 * (%XE_PXP_HWDRM_DEFAULT_SESSION) will be started, if it isn't already running.1368 * (%DRM_XE_PXP_HWDRM_DEFAULT_SESSION) will be started, if it isn't already running.
1370 * The user is expected to query the PXP status via the query ioctl (see1369 * The user is expected to query the PXP status via the query ioctl (see
1371 * %DRM_XE_DEVICE_QUERY_PXP_STATUS) and to wait for PXP to be ready before1370 * %DRM_XE_DEVICE_QUERY_PXP_STATUS) and to wait for PXP to be ready before
1372 * attempting to create a queue with this property. When a queue is created1371 * attempting to create a queue with this property. When a queue is created
@@ -1651,7 +1650,6 @@ struct drm_xe_exec { · 278 unmodified lines
1651 *1650 *
1652 * and the @flags can be:1651 * and the @flags can be:
1653 * - %DRM_XE_UFENCE_WAIT_FLAG_ABSTIME1652 * - %DRM_XE_UFENCE_WAIT_FLAG_ABSTIME
1654 * - %DRM_XE_UFENCE_WAIT_FLAG_SOFT_OP
1655 *1653 *
1656 * The @mask values can be for example:1654 * The @mask values can be for example:
1657 * - 0xffu for u81655 * - 0xffu for u8
@@ -1741,7 +1739,7 @@ enum drm_xe_observation_op { · 83 unmodified lines
1741};1739};
1742 1740
1743/**1741/**
1744 * struct drm_xe_observation_param - Input of &DRM_XE_OBSERVATION1742 * struct drm_xe_observation_param - Input of &DRM_IOCTL_XE_OBSERVATION
1745 *1743 *
1746 * The observation layer enables multiplexing observation streams of1744 * The observation layer enables multiplexing observation streams of
1747 * multiple types. The actual params for a particular stream operation are1745 * multiple types. The actual params for a particular stream operation are
@@ -1902,10 +1900,10 @@ enum drm_xe_oa_format_type { · 154 unmodified lines
1902};1900};
1903 1901
1904/**1902/**
1905 * enum drm_xe_oa_property_id - OA stream property id's1903 * enum drm_xe_oa_property_id - OA stream property IDs
1906 *1904 *
1907 * Stream params are specified as a chain of @drm_xe_ext_set_property1905 * Stream params are specified as a chain of @drm_xe_ext_set_property
1908 * struct's, with @property values from enum @drm_xe_oa_property_id and1906 * structs, with @property values from enum @drm_xe_oa_property_id and
1909 * @drm_xe_user_extension base.name set to @DRM_XE_OA_EXTENSION_SET_PROPERTY.1907 * @drm_xe_user_extension base.name set to @DRM_XE_OA_EXTENSION_SET_PROPERTY.
1910 * @param field in struct @drm_xe_observation_param points to the first1908 * @param field in struct @drm_xe_observation_param points to the first
1911 * @drm_xe_ext_set_property struct.1909 * @drm_xe_ext_set_property struct.
@@ -1919,7 +1917,7 @@ enum drm_xe_oa_property_id { · 7 unmodified lines
1919 /**1917 /**
1920 * @DRM_XE_OA_PROPERTY_OA_UNIT_ID: ID of the OA unit on which to open1918 * @DRM_XE_OA_PROPERTY_OA_UNIT_ID: ID of the OA unit on which to open
1921 * the OA stream, see @oa_unit_id in 'struct1919 * the OA stream, see @oa_unit_id in 'struct
1922 * drm_xe_query_oa_units'. Defaults to 0 if not provided.1920 * drm_xe_oa_unit'. Defaults to 0 if not provided.
1923 */1921 */
1924 DRM_XE_OA_PROPERTY_OA_UNIT_ID = 1,1922 DRM_XE_OA_PROPERTY_OA_UNIT_ID = 1,
1925 1923
@@ -2369,10 +2367,10 @@ struct drm_xe_madvise { · 443 unmodified lines
2369};2367};
2370 2368
2371/**2369/**
2372 * struct drm_xe_mem_range_attr - Output of &DRM_IOCTL_XE_VM_QUERY_MEM_RANGES_ATTRS2370 * struct drm_xe_mem_range_attr - Output of &DRM_IOCTL_XE_VM_QUERY_MEM_RANGE_ATTRS
2373 *2371 *
2374 * This structure is provided by userspace and filled by KMD in response to the2372 * This structure is provided by userspace and filled by KMD in response to the
2375 * DRM_IOCTL_XE_VM_QUERY_MEM_RANGES_ATTRS ioctl. It describes memory attributes of2373 * DRM_IOCTL_XE_VM_QUERY_MEM_RANGE_ATTRS ioctl. It describes memory attributes of
2376 * memory ranges within a user specified address range in a VM.2374 * memory ranges within a user specified address range in a VM.
2377 *2375 *
2378 * The structure includes information such as atomic access policy,2376 * The structure includes information such as atomic access policy,
@@ -2427,7 +2425,7 @@ struct drm_xe_mem_range_attr { · 48 unmodified lines
2427};2425};
2428 2426
2429/**2427/**
2430 * struct drm_xe_vm_query_mem_range_attr - Input of &DRM_IOCTL_XE_VM_QUERY_MEM_ATTRIBUTES2428 * struct drm_xe_vm_query_mem_range_attr - Input of &DRM_IOCTL_XE_VM_QUERY_MEM_RANGE_ATTRS
2431 *2429 *
2432 * This structure is used to query memory attributes of memory regions2430 * This structure is used to query memory attributes of memory regions
2433 * within a user specified address range in a VM. It provides detailed2431 * within a user specified address range in a VM. It provides detailed
@@ -2435,14 +2433,14 @@ struct drm_xe_mem_range_attr { · 1 unmodified line
2435 * page attribute table (PAT) index, and preferred memory location.2433 * page attribute table (PAT) index, and preferred memory location.
2436 *2434 *
2437 * Userspace first calls the ioctl with @num_mem_ranges = 0,2435 * Userspace first calls the ioctl with @num_mem_ranges = 0,
2438 * @sizeof_mem_ranges_attr = 0 and @vector_of_vma_mem_attr = NULL to retrieve2436 * @sizeof_mem_range_attr = 0 and @vector_of_mem_attr = NULL to retrieve
2439 * the number of memory regions and size of each memory range attribute.2437 * the number of memory regions and size of each memory range attribute.
2440 * Then, it allocates a buffer of that size and calls the ioctl again to fill2438 * Then, it allocates a buffer of that size and calls the ioctl again to fill
2441 * the buffer with memory range attributes.2439 * the buffer with memory range attributes.
2442 *2440 *
2443 * If second call fails with -ENOSPC, it means memory ranges changed between2441 * If second call fails with -ENOSPC, it means memory ranges changed between
2444 * first call and now, retry IOCTL again with @num_mem_ranges = 0,2442 * first call and now, retry IOCTL again with @num_mem_ranges = 0,
2445 * @sizeof_mem_ranges_attr = 0 and @vector_of_vma_mem_attr = NULL followed by2443 * @sizeof_mem_range_attr = 0 and @vector_of_mem_attr = NULL followed by
2446 * second ioctl call.2444 * second ioctl call.
2447 *2445 *
2448 * Example:2446 * Example: