From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Francois Dugast <francois.dugast@intel.com>
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [Intel-xe] [PATCH v2 1/3] drm/xe: Replace XE_WARN_ON with drm_warn when just printing a string
Date: Wed, 6 Sep 2023 10:38:33 -0400 [thread overview]
Message-ID: <ZPiO6VMKLu10Sq5C@intel.com> (raw)
In-Reply-To: <20230830123722.6-2-francois.dugast@intel.com>
On Wed, Aug 30, 2023 at 12:37:20PM +0000, Francois Dugast wrote:
> Use the generic drm_warn instead of the driver-specific XE_WARN_ON
> in cases where XE_WARN_ON is used to unconditionally print a debug
> message.
>
> Signed-off-by: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/xe/xe_gt_debugfs.c | 5 +++--
> drivers/gpu/drm/xe/xe_gt_pagefault.c | 3 ++-
> drivers/gpu/drm/xe/xe_guc_ct.c | 2 +-
> drivers/gpu/drm/xe/xe_guc_submit.c | 9 ++++++---
> drivers/gpu/drm/xe/xe_vm.c | 18 +++++++++---------
> drivers/gpu/drm/xe/xe_vm_madvise.c | 2 +-
> 6 files changed, 22 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> index b871e45af813..9229fd5b01cc 100644
> --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> @@ -151,6 +151,7 @@ static const struct drm_info_list debugfs_list[] = {
>
> void xe_gt_debugfs_register(struct xe_gt *gt)
> {
> + struct xe_device *xe = gt_to_xe(gt);
> struct drm_minor *minor = gt_to_xe(gt)->drm.primary;
> struct dentry *root;
> struct drm_info_list *local;
> @@ -162,7 +163,7 @@ void xe_gt_debugfs_register(struct xe_gt *gt)
> sprintf(name, "gt%d", gt->info.id);
> root = debugfs_create_dir(name, minor->debugfs_root);
> if (IS_ERR(root)) {
> - XE_WARN_ON("Create GT directory failed");
> + drm_warn(&xe->drm, "Create GT directory failed");
> return;
> }
>
> @@ -172,7 +173,7 @@ void xe_gt_debugfs_register(struct xe_gt *gt)
> * passed in (e.g. can't define this on the stack).
> */
> #define DEBUGFS_SIZE (ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list))
> - local = drmm_kmalloc(>_to_xe(gt)->drm, DEBUGFS_SIZE, GFP_KERNEL);
> + local = drmm_kmalloc(&xe->drm, DEBUGFS_SIZE, GFP_KERNEL);
> if (!local)
> return;
>
> diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c
> index b6f781b3d9d7..845cde2fbd01 100644
> --- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
> +++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
> @@ -328,6 +328,7 @@ static bool pf_queue_full(struct pf_queue *pf_queue)
> int xe_guc_pagefault_handler(struct xe_guc *guc, u32 *msg, u32 len)
> {
> struct xe_gt *gt = guc_to_gt(guc);
> + struct xe_device *xe = gt_to_xe(gt);
> struct pf_queue *pf_queue;
> unsigned long flags;
> u32 asid;
> @@ -346,7 +347,7 @@ int xe_guc_pagefault_handler(struct xe_guc *guc, u32 *msg, u32 len)
> pf_queue->tail = (pf_queue->tail + len) % PF_QUEUE_NUM_DW;
> queue_work(gt->usm.pf_wq, &pf_queue->worker);
> } else {
> - XE_WARN_ON("PF Queue full, shouldn't be possible");
> + drm_warn(&xe->drm, "PF Queue full, shouldn't be possible");
> }
> spin_unlock_irqrestore(&pf_queue->lock, flags);
>
> diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
> index b92e04ba8f63..13f2bd586f6a 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ct.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ct.c
> @@ -1022,7 +1022,7 @@ static void g2h_fast_path(struct xe_guc_ct *ct, u32 *msg, u32 len)
> adj_len);
> break;
> default:
> - XE_WARN_ON("NOT_POSSIBLE");
> + drm_warn(&xe->drm, "NOT_POSSIBLE");
> }
>
> if (ret)
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
> index c6a9e17d6889..0a6c938ad3dc 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -703,6 +703,7 @@ static void disable_scheduling_deregister(struct xe_guc *guc,
> struct xe_exec_queue *q)
> {
> MAKE_SCHED_CONTEXT_ACTION(q, DISABLE);
> + struct xe_device *xe = guc_to_xe(guc);
> int ret;
>
> set_min_preemption_timeout(guc, q);
> @@ -712,7 +713,7 @@ static void disable_scheduling_deregister(struct xe_guc *guc,
> if (!ret) {
> struct drm_gpu_scheduler *sched = &q->guc->sched;
>
> - XE_WARN_ON("Pending enable failed to respond");
> + drm_warn(&xe->drm, "Pending enable failed to respond");
> sched->timeout = MIN_SCHED_TIMEOUT;
> drm_sched_run_wq_start(sched);
> xe_gt_reset_async(q->gt);
> @@ -794,6 +795,8 @@ static void xe_guc_exec_queue_lr_cleanup(struct work_struct *w)
> struct xe_guc_exec_queue *ge =
> container_of(w, struct xe_guc_exec_queue, lr_tdr);
> struct xe_exec_queue *q = ge->q;
> + struct xe_guc *guc = exec_queue_to_guc(q);
> + struct xe_device *xe = guc_to_xe(guc);
> struct drm_gpu_scheduler *sched = &ge->sched;
>
> XE_WARN_ON(!xe_exec_queue_is_lr(q));
> @@ -828,7 +831,7 @@ static void xe_guc_exec_queue_lr_cleanup(struct work_struct *w)
> !exec_queue_pending_disable(q) ||
> guc_read_stopped(guc), HZ * 5);
> if (!ret) {
> - XE_WARN_ON("Schedule disable failed to respond");
> + drm_warn(&xe->drm, "Schedule disable failed to respond");
> drm_sched_run_wq_start(sched);
> xe_gt_reset_async(q->gt);
> return;
> @@ -906,7 +909,7 @@ guc_exec_queue_timedout_job(struct drm_sched_job *drm_job)
> !exec_queue_pending_disable(q) ||
> guc_read_stopped(guc), HZ * 5);
> if (!ret || guc_read_stopped(guc)) {
> - XE_WARN_ON("Schedule disable failed to respond");
> + drm_warn(&xe->drm, "Schedule disable failed to respond");
> sched->timeout = MIN_SCHED_TIMEOUT;
> list_add(&drm_job->list, &sched->pending_list);
> drm_sched_run_wq_start(sched);
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index 15bff0783ec9..cc4fd885c264 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -1388,7 +1388,7 @@ static void vm_error_capture(struct xe_vm *vm, int err,
> }
>
> if (copy_to_user(address, &capture, sizeof(capture)))
> - XE_WARN_ON("Copy to user failed");
> + drm_warn(&vm->xe->drm, "Copy to user failed");
>
> if (in_kthread) {
> kthread_unuse_mm(vm->async_ops.error_capture.mm);
> @@ -2190,7 +2190,7 @@ static int vm_bind_ioctl_lookup_vma(struct xe_vm *vm, struct xe_bo *bo,
> return -ENODATA;
> break;
> default:
> - XE_WARN_ON("NOT POSSIBLE");
> + drm_warn(&xe->drm, "NOT POSSIBLE");
> return -EINVAL;
> }
>
> @@ -2248,7 +2248,7 @@ static void print_op(struct xe_device *xe, struct drm_gpuva_op *op)
> (ULL)xe_vma_start(vma), (ULL)xe_vma_size(vma));
> break;
> default:
> - XE_WARN_ON("NOT POSSIBLE");
> + drm_warn(&xe->drm, "NOT POSSIBLE");
> }
> }
> #else
> @@ -2340,7 +2340,7 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo,
> }
> break;
> default:
> - XE_WARN_ON("NOT POSSIBLE");
> + drm_warn(&vm->xe->drm, "NOT POSSIBLE");
> ops = ERR_PTR(-EINVAL);
> }
>
> @@ -2585,7 +2585,7 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q,
> /* Nothing to do */
> break;
> default:
> - XE_WARN_ON("NOT POSSIBLE");
> + drm_warn(&vm->xe->drm, "NOT POSSIBLE");
> }
>
> last_op = op;
> @@ -2647,7 +2647,7 @@ static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op)
> /* Nothing to do */
> break;
> default:
> - XE_WARN_ON("NOT POSSIBLE");
> + drm_warn(&vm->xe->drm, "NOT POSSIBLE");
> }
>
> op->flags |= XE_VMA_OP_COMMITTED;
> @@ -2765,7 +2765,7 @@ static int __xe_vma_op_execute(struct xe_vm *vm, struct xe_vma *vma,
> op->flags & XE_VMA_OP_LAST);
> break;
> default:
> - XE_WARN_ON("NOT POSSIBLE");
> + drm_warn(&vm->xe->drm, "NOT POSSIBLE");
> }
>
> ttm_eu_backoff_reservation(&ww, &objs);
> @@ -2824,7 +2824,7 @@ static int xe_vma_op_execute(struct xe_vm *vm, struct xe_vma_op *op)
> op);
> break;
> default:
> - XE_WARN_ON("NOT POSSIBLE");
> + drm_warn(&vm->xe->drm, "NOT POSSIBLE");
> }
>
> return ret;
> @@ -2900,7 +2900,7 @@ static void xe_vma_op_unwind(struct xe_vm *vm, struct xe_vma_op *op,
> /* Nothing to do */
> break;
> default:
> - XE_WARN_ON("NOT POSSIBLE");
> + drm_warn(&vm->xe->drm, "NOT POSSIBLE");
> }
> }
>
> diff --git a/drivers/gpu/drm/xe/xe_vm_madvise.c b/drivers/gpu/drm/xe/xe_vm_madvise.c
> index c9bc59be5094..70ec2c07a3bb 100644
> --- a/drivers/gpu/drm/xe/xe_vm_madvise.c
> +++ b/drivers/gpu/drm/xe/xe_vm_madvise.c
> @@ -192,7 +192,7 @@ static int madvise_priority(struct xe_device *xe, struct xe_vm *vm,
> static int madvise_pin(struct xe_device *xe, struct xe_vm *vm,
> struct xe_vma **vmas, int num_vmas, u64 value)
> {
> - XE_WARN_ON("NIY");
> + drm_warn(&xe->drm, "NIY");
> return 0;
> }
>
> --
> 2.34.1
>
next prev parent reply other threads:[~2023-09-06 14:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-30 12:37 [Intel-xe] [PATCH v2 0/3] Use Xe assert macros instead of XE_WARN_ON macro Francois Dugast
2023-08-30 12:37 ` [Intel-xe] [PATCH v2 1/3] drm/xe: Replace XE_WARN_ON with drm_warn when just printing a string Francois Dugast
2023-09-06 14:38 ` Rodrigo Vivi [this message]
2023-08-30 12:37 ` [Intel-xe] [PATCH v2 2/3] drm/xe: Introduce Xe assert macros Francois Dugast
2023-08-30 12:37 ` [Intel-xe] [PATCH v2 3/3] drm/xe: Use Xe assert macros instead of XE_WARN_ON macro Francois Dugast
2023-09-06 14:38 ` Rodrigo Vivi
2023-09-06 19:46 ` Matt Roper
2023-08-30 14:22 ` [Intel-xe] ✓ CI.Patch_applied: success for Use Xe assert macros instead of XE_WARN_ON macro (rev2) Patchwork
2023-08-30 14:22 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-08-30 14:23 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-08-30 14:29 ` [Intel-xe] ✗ CI.Build: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZPiO6VMKLu10Sq5C@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=francois.dugast@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.