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_sync.c | |
| parent | 5ce58303440b7efb21c554cb0b6614482aab8fe9 (diff) | |
| download | linux-next-b8c1ba831e675005ff871cd4a4e04ff90326b4ae.tar.gz linux-next-b8c1ba831e675005ff871cd4a4e04ff90326b4ae.zip | |
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_sync.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_sync.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c index 7786b908a3fd..9fcd7802ba30 100644 --- a/drivers/gpu/drm/xe/xe_sync.c +++ b/drivers/gpu/drm/xe/xe_sync.c @@ -110,44 +110,44 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, if (copy_from_user(&sync_in, sync_user, sizeof(*sync_user))) return -EFAULT; - if (XE_IOCTL_ERR(xe, sync_in.flags & + if (XE_IOCTL_DBG(xe, sync_in.flags & ~(SYNC_FLAGS_TYPE_MASK | DRM_XE_SYNC_SIGNAL)) || - XE_IOCTL_ERR(xe, sync_in.pad) || - XE_IOCTL_ERR(xe, sync_in.reserved[0] || sync_in.reserved[1])) + XE_IOCTL_DBG(xe, sync_in.pad) || + XE_IOCTL_DBG(xe, sync_in.reserved[0] || sync_in.reserved[1])) return -EINVAL; signal = sync_in.flags & DRM_XE_SYNC_SIGNAL; switch (sync_in.flags & SYNC_FLAGS_TYPE_MASK) { case DRM_XE_SYNC_SYNCOBJ: - if (XE_IOCTL_ERR(xe, no_dma_fences && signal)) + if (XE_IOCTL_DBG(xe, no_dma_fences && signal)) return -EOPNOTSUPP; - if (XE_IOCTL_ERR(xe, upper_32_bits(sync_in.addr))) + if (XE_IOCTL_DBG(xe, upper_32_bits(sync_in.addr))) return -EINVAL; sync->syncobj = drm_syncobj_find(xef->drm, sync_in.handle); - if (XE_IOCTL_ERR(xe, !sync->syncobj)) + if (XE_IOCTL_DBG(xe, !sync->syncobj)) return -ENOENT; if (!signal) { sync->fence = drm_syncobj_fence_get(sync->syncobj); - if (XE_IOCTL_ERR(xe, !sync->fence)) + if (XE_IOCTL_DBG(xe, !sync->fence)) return -EINVAL; } break; case DRM_XE_SYNC_TIMELINE_SYNCOBJ: - if (XE_IOCTL_ERR(xe, no_dma_fences && signal)) + if (XE_IOCTL_DBG(xe, no_dma_fences && signal)) return -EOPNOTSUPP; - if (XE_IOCTL_ERR(xe, upper_32_bits(sync_in.addr))) + if (XE_IOCTL_DBG(xe, upper_32_bits(sync_in.addr))) return -EINVAL; - if (XE_IOCTL_ERR(xe, sync_in.timeline_value == 0)) + if (XE_IOCTL_DBG(xe, sync_in.timeline_value == 0)) return -EINVAL; sync->syncobj = drm_syncobj_find(xef->drm, sync_in.handle); - if (XE_IOCTL_ERR(xe, !sync->syncobj)) + if (XE_IOCTL_DBG(xe, !sync->syncobj)) return -ENOENT; if (signal) { @@ -156,7 +156,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, return -ENOMEM; } else { sync->fence = drm_syncobj_fence_get(sync->syncobj); - if (XE_IOCTL_ERR(xe, !sync->fence)) + if (XE_IOCTL_DBG(xe, !sync->fence)) return -EINVAL; err = dma_fence_chain_find_seqno(&sync->fence, @@ -167,15 +167,15 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, break; case DRM_XE_SYNC_DMA_BUF: - if (XE_IOCTL_ERR(xe, "TODO")) + if (XE_IOCTL_DBG(xe, "TODO")) return -EINVAL; break; case DRM_XE_SYNC_USER_FENCE: - if (XE_IOCTL_ERR(xe, !signal)) + if (XE_IOCTL_DBG(xe, !signal)) return -EOPNOTSUPP; - if (XE_IOCTL_ERR(xe, sync_in.addr & 0x7)) + if (XE_IOCTL_DBG(xe, sync_in.addr & 0x7)) return -EINVAL; if (exec) { @@ -183,7 +183,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, } else { sync->ufence = user_fence_create(xe, sync_in.addr, sync_in.timeline_value); - if (XE_IOCTL_ERR(xe, !sync->ufence)) + if (XE_IOCTL_DBG(xe, !sync->ufence)) return -ENOMEM; } |
