diff options
| author | Francois Dugast <francois.dugast@intel.com> | 2023-07-17 10:20:18 +0200 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-21 11:37:30 -0500 |
| commit | b8c1ba831e675005ff871cd4a4e04ff90326b4ae (patch) | |
| tree | de3632bd0b6e46956f00b8c302385e2b3fd5adae /drivers/gpu/drm/xe/xe_wait_user_fence.c | |
| parent | 5ce58303440b7efb21c554cb0b6614482aab8fe9 (diff) | |
drm/xe: Prevent flooding the kernel log with XE_IOCTL_ERR
Lower log level of XE_IOCTL_ERR macro to debug in order to prevent flooding
kernel log.
v2: Rename XE_IOCTL_ERR to XE_IOCTL_DBG (Rodrigo Vivi)
v3: Rebase
v4: Fix style, remove unrelated change about __FILE__ and __LINE__
Link: https://lists.freedesktop.org/archives/intel-xe/2023-May/004704.html
Signed-off-by: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_wait_user_fence.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_wait_user_fence.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/gpu/drm/xe/xe_wait_user_fence.c b/drivers/gpu/drm/xe/xe_wait_user_fence.c index c4420c0dbf9c..c4202df1d4f0 100644 --- a/drivers/gpu/drm/xe/xe_wait_user_fence.c +++ b/drivers/gpu/drm/xe/xe_wait_user_fence.c @@ -117,51 +117,51 @@ int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data, unsigned long timeout; ktime_t start; - if (XE_IOCTL_ERR(xe, args->extensions) || XE_IOCTL_ERR(xe, args->pad) || - XE_IOCTL_ERR(xe, args->reserved[0] || args->reserved[1])) + if (XE_IOCTL_DBG(xe, args->extensions) || XE_IOCTL_DBG(xe, args->pad) || + XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1])) return -EINVAL; - if (XE_IOCTL_ERR(xe, args->flags & ~VALID_FLAGS)) + if (XE_IOCTL_DBG(xe, args->flags & ~VALID_FLAGS)) return -EINVAL; - if (XE_IOCTL_ERR(xe, args->op > MAX_OP)) + if (XE_IOCTL_DBG(xe, args->op > MAX_OP)) return -EINVAL; - if (XE_IOCTL_ERR(xe, no_engines && + if (XE_IOCTL_DBG(xe, no_engines && (args->num_engines || args->instances))) return -EINVAL; - if (XE_IOCTL_ERR(xe, !no_engines && !args->num_engines)) + if (XE_IOCTL_DBG(xe, !no_engines && !args->num_engines)) return -EINVAL; - if (XE_IOCTL_ERR(xe, !(args->flags & DRM_XE_UFENCE_WAIT_VM_ERROR) && + if (XE_IOCTL_DBG(xe, !(args->flags & DRM_XE_UFENCE_WAIT_VM_ERROR) && addr & 0x7)) return -EINVAL; - if (XE_IOCTL_ERR(xe, args->num_engines > XE_HW_ENGINE_MAX_INSTANCE)) + if (XE_IOCTL_DBG(xe, args->num_engines > XE_HW_ENGINE_MAX_INSTANCE)) return -EINVAL; if (!no_engines) { err = copy_from_user(eci, user_eci, sizeof(struct drm_xe_engine_class_instance) * args->num_engines); - if (XE_IOCTL_ERR(xe, err)) + if (XE_IOCTL_DBG(xe, err)) return -EFAULT; - if (XE_IOCTL_ERR(xe, check_hw_engines(xe, eci, + if (XE_IOCTL_DBG(xe, check_hw_engines(xe, eci, args->num_engines))) return -EINVAL; } if (args->flags & DRM_XE_UFENCE_WAIT_VM_ERROR) { - if (XE_IOCTL_ERR(xe, args->vm_id >> 32)) + if (XE_IOCTL_DBG(xe, args->vm_id >> 32)) return -EINVAL; vm = xe_vm_lookup(to_xe_file(file), args->vm_id); - if (XE_IOCTL_ERR(xe, !vm)) + if (XE_IOCTL_DBG(xe, !vm)) return -ENOENT; - if (XE_IOCTL_ERR(xe, !vm->async_ops.error_capture.addr)) { + if (XE_IOCTL_DBG(xe, !vm->async_ops.error_capture.addr)) { xe_vm_put(vm); return -EOPNOTSUPP; } @@ -226,9 +226,9 @@ int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data, args->timeout = 0; } - if (XE_IOCTL_ERR(xe, err < 0)) + if (XE_IOCTL_DBG(xe, err < 0)) return err; - else if (XE_IOCTL_ERR(xe, !timeout)) + else if (XE_IOCTL_DBG(xe, !timeout)) return -ETIME; return 0; |