drm/Xe: Use EOPNOTSUPP instead of ENOTSUPP
Subsystems (2)
PATCH 1/1 drm/Xe: Use EOPNOTSUPP instead of ENOTSUPP
From: Janga Rahul Kumar <[email protected]>
ENOTSUPP is not a standard Unix error.
--- drivers/gpu/drm/xe/xe_engine.c | 2 +- drivers/gpu/drm/xe/xe_mmio.c | 4 ++-- drivers/gpu/drm/xe/xe_sync.c | 6 +++--- drivers/gpu/drm/xe/xe_vm.c | 8 ++++---- drivers/gpu/drm/xe/xe_wait_user_fence.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/xe/xe_engine.c +1 -1
@@ -609,7 +609,7 @@ int xe_engine_create_ioctl(struct drm_device *dev, void *data,if (XE_IOCTL_ERR (xe, e->vm &&xe_vm_in_compute_mode (e->vm) != !!(e->flags &ENGINE_FLAG_COMPUTE_MODE ))) { - err = -ENOTSUPP ; + err = -EOPNOTSUPP ; goto put_engine; }
drivers/gpu/drm/xe/xe_mmio.c +2 -2
@@ -461,7 +461,7 @@ int xe_mmio_ioctl(struct drm_device *dev, void *data, fallthrough;case DRM_XE_MMIO_8BIT :/* TODO */ case DRM_XE_MMIO_16BIT :/* TODO */ - ret = -ENOTSUPP ; + ret = -EOPNOTSUPP ; goto exit; } }
@@ -479,7 +479,7 @@ int xe_mmio_ioctl(struct drm_device *dev, void *data, fallthrough;case DRM_XE_MMIO_8BIT :/* TODO */ case DRM_XE_MMIO_16BIT :/* TODO */ - ret = -ENOTSUPP ; + ret = -EOPNOTSUPP ; } }
drivers/gpu/drm/xe/xe_sync.c +3 -3
@@ -116,7 +116,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,switch (sync_in.flags &SYNC_FLAGS_TYPE_MASK ) {case DRM_XE_SYNC_SYNCOBJ :if (XE_IOCTL_ERR (xe, no_dma_fences)) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe,upper_32_bits (sync_in.addr)))return -EINVAL ;
@@ -134,7 +134,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,case DRM_XE_SYNC_TIMELINE_SYNCOBJ :if (XE_IOCTL_ERR (xe, no_dma_fences)) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe,upper_32_bits (sync_in.addr)))return -EINVAL ;
@@ -169,7 +169,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,case DRM_XE_SYNC_USER_FENCE :if (XE_IOCTL_ERR (xe, !(sync_in.flags &DRM_XE_SYNC_SIGNAL ))) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe, sync_in.addr &0x7 ))return -EINVAL ;
drivers/gpu/drm/xe/xe_vm.c +4 -4
@@ -1764,10 +1764,10 @@ static int vm_set_error_capture_address(struct xe_device *xe, struct xe_vm *vm,return -EINVAL ;if (XE_IOCTL_ERR (xe, !(vm->flags &XE_VM_FLAG_ASYNC_BIND_OPS ))) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe, vm->async_ops.error_capture.addr)) -return -ENOTSUPP ; +return -EOPNOTSUPP ; vm->async_ops.error_capture.mm = current->mm; vm->async_ops.error_capture.addr = value;
@@ -3033,7 +3033,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)if (VM_BIND_OP (bind_ops[0 ].op) ==XE_VM_BIND_OP_RESTART ) {if (XE_IOCTL_ERR (xe, !(vm->flags &XE_VM_FLAG_ASYNC_BIND_OPS ))) - err = -ENOTSUPP ; + err = -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe, !err && args->num_syncs)) err =EINVAL ;if (XE_IOCTL_ERR (xe, !err && !vm->async_ops.error))
@@ -3058,7 +3058,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)if (XE_IOCTL_ERR (xe, !vm->async_ops.error && async != !!(vm->flags &XE_VM_FLAG_ASYNC_BIND_OPS ))) { - err = -ENOTSUPP ; + err = -EOPNOTSUPP ; goto put_engine; }
drivers/gpu/drm/xe/xe_wait_user_fence.c +1 -1
@@ -142,7 +142,7 @@ int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data,if (XE_IOCTL_ERR (xe, !vm->async_ops.error_capture.addr)) {xe_vm_put (vm); -return -ENOTSUPP ; +return -EOPNOTSUPP ; } addr = vm->async_ops.error_capture.addr;
Signature · 1 line
2.25.1
Patchwork
CI[Intel-xe] ✗ CI.Patch_applied: failure for drm/Xe: Use EOPNOTSUPP instead of ENOTSUPP
== Series Details ==
== Series Details ==
Series: drm/Xe: Use EOPNOTSUPP instead of ENOTSUPP
URL : https://patchwork.freedesktop.org/series/119002/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-xe-next' with base: ===
Base commit: 0f657f7b7 drm/xe/display: Allow scanout of bos that can be migrated to lmem === git am output follows ===
error: patch failed: drivers/gpu/drm/xe/xe_sync.c:116
error: drivers/gpu/drm/xe/xe_sync.c: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: drm/Xe: Use EOPNOTSUPP instead of ENOTSUPP
Patch failed at 0001 drm/Xe: Use EOPNOTSUPP instead of ENOTSUPP
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Quoted 3 lines · On 07-06-2023 16:36, [email protected] wrote:
From: Janga Rahul Kumar <[email protected]>
ENOTSUPP is not a standard Unix error.
may be just complete the sentence "should use ENOTSUPP instead."
Quoted 117 lines
Cc Aravind Iddamsetty <[email protected]>Signed-off-by Janga Rahul Kumar <[email protected]>--- drivers/gpu/drm/xe/xe_engine.c | 2 +- drivers/gpu/drm/xe/xe_mmio.c | 4 ++-- drivers/gpu/drm/xe/xe_sync.c | 6 +++--- drivers/gpu/drm/xe/xe_vm.c | 8 ++++---- drivers/gpu/drm/xe/xe_wait_user_fence.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)drivers/gpu/drm/xe/xe_engine.c +1
-1@@ -609,7 +609,7 @@ int xe_engine_create_ioctl(struct drm_device *dev, void *data,if (XE_IOCTL_ERR (xe, e->vm &&xe_vm_in_compute_mode (e->vm) != !!(e->flags &ENGINE_FLAG_COMPUTE_MODE ))) { - err = -ENOTSUPP ; + err = -EOPNOTSUPP ; goto put_engine; }drivers/gpu/drm/xe/xe_mmio.c +2
-2@@ -461,7 +461,7 @@ int xe_mmio_ioctl(struct drm_device *dev, void *data, fallthrough;case DRM_XE_MMIO_8BIT :/* TODO */ case DRM_XE_MMIO_16BIT :/* TODO */ - ret = -ENOTSUPP ; + ret = -EOPNOTSUPP ; goto exit; } }@@ -479,7 +479,7 @@ int xe_mmio_ioctl(struct drm_device *dev, void *data, fallthrough;case DRM_XE_MMIO_8BIT :/* TODO */ case DRM_XE_MMIO_16BIT :/* TODO */ - ret = -ENOTSUPP ; + ret = -EOPNOTSUPP ; } }drivers/gpu/drm/xe/xe_sync.c +3
-3@@ -116,7 +116,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,switch (sync_in.flags &SYNC_FLAGS_TYPE_MASK ) {case DRM_XE_SYNC_SYNCOBJ :if (XE_IOCTL_ERR (xe, no_dma_fences)) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe,upper_32_bits (sync_in.addr)))return -EINVAL ;@@ -134,7 +134,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,case DRM_XE_SYNC_TIMELINE_SYNCOBJ :if (XE_IOCTL_ERR (xe, no_dma_fences)) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe,upper_32_bits (sync_in.addr)))return -EINVAL ;@@ -169,7 +169,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,case DRM_XE_SYNC_USER_FENCE :if (XE_IOCTL_ERR (xe, !(sync_in.flags &DRM_XE_SYNC_SIGNAL ))) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe, sync_in.addr &0x7 ))return -EINVAL ;drivers/gpu/drm/xe/xe_vm.c +4
-4@@ -1764,10 +1764,10 @@ static int vm_set_error_capture_address(struct xe_device *xe, struct xe_vm *vm,return -EINVAL ;if (XE_IOCTL_ERR (xe, !(vm->flags &XE_VM_FLAG_ASYNC_BIND_OPS ))) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe, vm->async_ops.error_capture.addr)) -return -ENOTSUPP ; +return -EOPNOTSUPP ; vm->async_ops.error_capture.mm = current->mm; vm->async_ops.error_capture.addr = value;@@ -3033,7 +3033,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)if (VM_BIND_OP (bind_ops[0 ].op) ==XE_VM_BIND_OP_RESTART ) {if (XE_IOCTL_ERR (xe, !(vm->flags &XE_VM_FLAG_ASYNC_BIND_OPS ))) - err = -ENOTSUPP ; + err = -EOPNOTSUPP ;if (XE_IOCTL_ERR (xe, !err && args->num_syncs)) err =EINVAL ;if (XE_IOCTL_ERR (xe, !err && !vm->async_ops.error))@@ -3058,7 +3058,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)if (XE_IOCTL_ERR (xe, !vm->async_ops.error && async != !!(vm->flags &XE_VM_FLAG_ASYNC_BIND_OPS ))) { - err = -ENOTSUPP ; + err = -EOPNOTSUPP ; goto put_engine; }drivers/gpu/drm/xe/xe_wait_user_fence.c +0
-0
drivers/gpu/drm/xe/xe_wait_user_fence.c int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data, · line 148
Quoted 8 lines
drivers/gpu/drm/xe/xe_wait_user_fence.c +1
-1@@ -142,7 +142,7 @@ int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data,if (XE_IOCTL_ERR (xe, !vm->async_ops.error_capture.addr)) {xe_vm_put (vm); -return -ENOTSUPP ; +return -EOPNOTSUPP ; } addr = vm->async_ops.error_capture.addr;
good catch.
Thanks,
Aravind.