Commit 7e9337c2 authored by Rodrigo Vivi's avatar Rodrigo Vivi

drm/xe/uapi: Ensure every uapi struct has drm_xe prefix

To ensure consistency and avoid possible later conflicts,
let's add drm_xe prefix to xe_user_extension struct.

Cc: Francois Dugast <francois.dugast@intel.com>
Suggested-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Acked-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Acked-by: default avatarMateusz Naklicki <mateusz.naklicki@intel.com>
parent 90a8b23f
...@@ -453,7 +453,7 @@ static int exec_queue_user_extensions(struct xe_device *xe, struct xe_exec_queue ...@@ -453,7 +453,7 @@ static int exec_queue_user_extensions(struct xe_device *xe, struct xe_exec_queue
u64 extensions, int ext_number, bool create) u64 extensions, int ext_number, bool create)
{ {
u64 __user *address = u64_to_user_ptr(extensions); u64 __user *address = u64_to_user_ptr(extensions);
struct xe_user_extension ext; struct drm_xe_user_extension ext;
int err; int err;
u32 idx; u32 idx;
......
...@@ -27,7 +27,7 @@ extern "C" { ...@@ -27,7 +27,7 @@ extern "C" {
#define DRM_XE_RESET_FAILED_UEVENT "DEVICE_STATUS" #define DRM_XE_RESET_FAILED_UEVENT "DEVICE_STATUS"
/** /**
* struct xe_user_extension - Base class for defining a chain of extensions * struct drm_xe_user_extension - Base class for defining a chain of extensions
* *
* Many interfaces need to grow over time. In most cases we can simply * Many interfaces need to grow over time. In most cases we can simply
* extend the struct and have userspace pass in more data. Another option, * extend the struct and have userspace pass in more data. Another option,
...@@ -45,29 +45,29 @@ extern "C" { ...@@ -45,29 +45,29 @@ extern "C" {
* *
* .. code-block:: C * .. code-block:: C
* *
* struct xe_user_extension ext3 { * struct drm_xe_user_extension ext3 {
* .next_extension = 0, // end * .next_extension = 0, // end
* .name = ..., * .name = ...,
* }; * };
* struct xe_user_extension ext2 { * struct drm_xe_user_extension ext2 {
* .next_extension = (uintptr_t)&ext3, * .next_extension = (uintptr_t)&ext3,
* .name = ..., * .name = ...,
* }; * };
* struct xe_user_extension ext1 { * struct drm_xe_user_extension ext1 {
* .next_extension = (uintptr_t)&ext2, * .next_extension = (uintptr_t)&ext2,
* .name = ..., * .name = ...,
* }; * };
* *
* Typically the struct xe_user_extension would be embedded in some uAPI * Typically the struct drm_xe_user_extension would be embedded in some uAPI
* struct, and in this case we would feed it the head of the chain(i.e ext1), * struct, and in this case we would feed it the head of the chain(i.e ext1),
* which would then apply all of the above extensions. * which would then apply all of the above extensions.
* *
*/ */
struct xe_user_extension { struct drm_xe_user_extension {
/** /**
* @next_extension: * @next_extension:
* *
* Pointer to the next struct xe_user_extension, or zero if the end. * Pointer to the next struct drm_xe_user_extension, or zero if the end.
*/ */
__u64 next_extension; __u64 next_extension;
...@@ -78,7 +78,7 @@ struct xe_user_extension { ...@@ -78,7 +78,7 @@ struct xe_user_extension {
* *
* Also note that the name space for this is not global for the whole * Also note that the name space for this is not global for the whole
* driver, but rather its scope/meaning is limited to the specific piece * driver, but rather its scope/meaning is limited to the specific piece
* of uAPI which has embedded the struct xe_user_extension. * of uAPI which has embedded the struct drm_xe_user_extension.
*/ */
__u32 name; __u32 name;
...@@ -625,7 +625,7 @@ struct drm_xe_gem_mmap_offset { ...@@ -625,7 +625,7 @@ struct drm_xe_gem_mmap_offset {
/** struct drm_xe_ext_set_property - XE set property extension */ /** struct drm_xe_ext_set_property - XE set property extension */
struct drm_xe_ext_set_property { struct drm_xe_ext_set_property {
/** @base: base user extension */ /** @base: base user extension */
struct xe_user_extension base; struct drm_xe_user_extension base;
/** @property: property to set */ /** @property: property to set */
__u32 property; __u32 property;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment