drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
Subsystems (3)
Rodrigo Vivi
maintainerPATCH 1/1 drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
Fix typos, lingo and other small things identified during uapi review.
--- include/uapi/drm/xe_drm.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
include/uapi/drm/xe_drm.h +12 -11
@@ -256,7 +256,7 @@ struct drm_xe_query_config {#define XE_QUERY_CONFIG_REV_AND_DEVICE_ID 0#define XE_QUERY_CONFIG_FLAGS 1#define XE_QUERY_CONFIG_FLAGS_HAS_VRAM (0x1 << 0) -#define XE_QUERY_CONFIG_MIN_ALIGNEMENT 2 +#define XE_QUERY_CONFIG_MIN_ALIGNMENT 2#define XE_QUERY_CONFIG_VA_BITS 3#define XE_QUERY_CONFIG_GT_COUNT 4#define XE_QUERY_CONFIG_MEM_REGION_COUNT 5
@@ -449,7 +449,6 @@ struct drm_xe_gem_create {* If a VM is specified, this BO must: * * 1. Only ever be bound to that VM. -* * 2. Cannot be exported as a PRIME fd. */ __u32 vm_id;
@@ -489,7 +488,7 @@ struct drm_xe_gem_mmap_offset {* struct drm_xe_vm_bind_op_error_capture - format of VM bind op error capture */ struct drm_xe_vm_bind_op_error_capture { -/** @error: errno that occured */ +/** @error: errno that occurred */ __s32 error;/** @op: operation that encounter an error */
@@ -609,7 +608,7 @@ struct drm_xe_vm_bind_op {* caused the error will be captured in drm_xe_vm_bind_op_error_capture. * Once the user sees the error (via a ufence + * XE_VM_PROPERTY_BIND_OP_ERROR_CAPTURE_ADDRESS), it should free memory -* via non-async unbinds, and then restart all queue'd async binds op via +* via non-async unbinds, and then restart all queued async binds op via * XE_VM_BIND_OP_RESTART. Or alternatively the user should destroy the * VM. *
@@ -620,7 +619,7 @@ struct drm_xe_vm_bind_op {#define XE_VM_BIND_FLAG_ASYNC (0x1 << 17)/* * Valid on a faulting VM only, do the MAP operation immediately rather -* than differing the MAP to the page fault handler. +* than deferring the MAP to the page fault handler. */ #define XE_VM_BIND_FLAG_IMMEDIATE (0x1 << 18)/*
@@ -727,7 +726,7 @@ struct drm_xe_exec_queue_set_property {#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER 6#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY 7#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY 8 -/** @property: property to set */ +/** @property: property to be set */ __u32 property;/** @value: property value */
@@ -796,7 +795,7 @@ struct drm_xe_exec_queue_get_property {__u32 exec_queue_id;#define XE_EXEC_QUEUE_GET_PROPERTY_BAN 0 -/** @property: property to get */ +/** @property: property to be gotten */ __u32 property;/** @value: property value */
@@ -907,7 +906,7 @@ struct drm_xe_mmio {/** * struct drm_xe_wait_user_fence - wait user fence * -* Wait on user fence, XE will wakeup on every HW engine interrupt in the +* Wait on user fence, XE will wake-up on every HW engine interrupt in the * instances list and check if user fence is complete:: * * (*addr & MASK) OP (VALUE & MASK)
@@ -1039,9 +1038,11 @@ struct drm_xe_vm_madvise {*/ #define DRM_XE_VM_MADVISE_PRIORITY 5#define DRM_XE_VMA_PRIORITY_LOW 0 -#define DRM_XE_VMA_PRIORITY_NORMAL 1/* Default */ -#define DRM_XE_VMA_PRIORITY_HIGH 2/* Must be elevated user */ -/* Pin the VMA in memory, must be elevated user */ +/* Default */ +#define DRM_XE_VMA_PRIORITY_NORMAL 1 +/* Must be user with elevated privileges */ +#define DRM_XE_VMA_PRIORITY_HIGH 2 +/* Pin the VMA in memory, must be user with elevated privileges */ #define DRM_XE_VM_MADVISE_PIN 6/** @property: property to set */ __u32 property;
Signature · 1 line
2.41.0
Patchwork
CI[Intel-xe] ✓ CI.Patch_applied: success for drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
== Series Details ==
== Series Details ==
Series: drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
URL : https://patchwork.freedesktop.org/series/123076/
State : success
== Summary ==
=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: 2c728d192 fixup! drm/xe: Rename engine to exec_queue === git am output follows ===
Applying: drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
Patchwork
CI[Intel-xe] ✗ CI.checkpatch: warning for drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
URL : https://patchwork.freedesktop.org/series/123076/
State : warning
== Summary ==
+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master e700ea2f248a75138759bcb443affeef4a2d1991
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit 05b904a7bc77d7400ba5cfacc751ce33ecb51a78
Author: Rodrigo Vivi <[email protected]> Date: Wed Aug 30 12:11:24 2023 -0400
drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
Fix typos, lingo and other small things identified during uapi review.
+ /mt/dim checkpatch 2c728d192daf742a57749f4fdfee53d8d7b75817 drm-intel /mt/dim: line 50: /root/.dimrc: No such file or directory
Patchwork
CI[Intel-xe] ✗ CI.KUnit: failure for drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: drm/xe/uapi: Typo lingo and other small backwards compatible fixes.
URL : https://patchwork.freedesktop.org/series/123076/
State : failure
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig ERROR:root:../drivers/gpu/drm/xe/xe_query.c: In function ‘query_config’:../drivers/gpu/drm/xe/xe_query.c:198:15: error: ‘XE_QUERY_CONFIG_MIN_ALIGNEMENT’ undeclared (first use in this function); did you mean ‘XE_QUERY_CONFIG_MIN_ALIGNMENT’?
198 | config->info[XE_QUERY_CONFIG_MIN_ALIGNEMENT] =
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| XE_QUERY_CONFIG_MIN_ALIGNMENT../drivers/gpu/drm/xe/xe_query.c:198:15: note: each undeclared identifier is reported only once for each function it appears in make[7]: *** [../scripts/Makefile.build:243: drivers/gpu/drm/xe/xe_query.o] Error 1
make[7]: *** Waiting for unfinished jobs....
make[6]: *** [../scripts/Makefile.build:480: drivers/gpu/drm/xe] Error 2
make[6]: *** Waiting for unfinished jobs....
make[5]: *** [../scripts/Makefile.build:480: drivers/gpu/drm] Error 2
make[4]: *** [../scripts/Makefile.build:480: drivers/gpu] Error 2
make[3]: *** [../scripts/Makefile.build:480: drivers] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [/kernel/Makefile:2032: .] Error 2
make[1]: *** [/kernel/Makefile:234: __sub-make] Error 2
make: *** [Makefile:234: __sub-make] Error 2
[17:04:19] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig [17:04:23] Building KUnit Kernel ... Populating config with: $ make ARCH=um O=.kunit olddefconfig Building with: $ make ARCH=um O=.kunit --jobs=48 + cleanup ++ stat -c %u:%g /kernel + chown -R 1003:1003 /kernel