From: "Tauro, Riana" <riana.tauro@intel.com>
To: Raag Jadav <raag.jadav@intel.com>, <intel-xe@lists.freedesktop.org>
Cc: <stuart.summers@intel.com>
Subject: Re: [PATCH v4 2/2] drm/xe/wedge: Introduce xe_wedge_mode_is_no_reset()
Date: Fri, 20 Nov 2026 14:55:29 +0530 [thread overview]
Message-ID: <689afa8d-99e8-4eeb-8d53-4e5bdda788e3@intel.com> (raw)
In-Reply-To: <20261119102344.2053821-3-raag.jadav@intel.com>
On 19-11-2026 15:52, Raag Jadav wrote:
> Convert open-coded XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET check into its
> own helper.
>
> Signed-off-by: Raag Jadav <raag.jadav@intel.com>
Reviewed-by: Riana Tauro <riana.tauro@intel.com>
> ---
> v2: Introduce xe_wedge_mode_is_no_reset()
> v3: Fix wedge_validate_mode() to check for local mode (Sashiko)
> v4: Also use xe_wedge_mode_is_no_reset() in guc_submit_hint_wedged() (Sashiko)
> ---
> drivers/gpu/drm/xe/xe_drm_ras.c | 2 +-
> drivers/gpu/drm/xe/xe_guc_ads.c | 3 ++-
> drivers/gpu/drm/xe/xe_guc_capture.c | 3 ++-
> drivers/gpu/drm/xe/xe_guc_submit.c | 4 ++--
> drivers/gpu/drm/xe/xe_pci_error.c | 2 +-
> drivers/gpu/drm/xe/xe_wedge.c | 5 ++---
> drivers/gpu/drm/xe/xe_wedge.h | 5 +++++
> 7 files changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_drm_ras.c b/drivers/gpu/drm/xe/xe_drm_ras.c
> index 3ca6c82345dd..86c589437a9f 100644
> --- a/drivers/gpu/drm/xe/xe_drm_ras.c
> +++ b/drivers/gpu/drm/xe/xe_drm_ras.c
> @@ -21,7 +21,7 @@ static const char * const error_severity[] = DRM_XE_RAS_ERROR_SEVERITY_NAMES;
> static int drm_ras_counter_get(struct xe_device *xe, struct xe_drm_ras_counter *info,
> u32 error_id, int *idx)
> {
> - if (xe_wedged(xe) && xe->wedged.mode != XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)
> + if (xe_wedged(xe) && !xe_wedge_mode_is_no_reset(xe))
> return -ECANCELED;
>
> if (!info || !info[error_id].name)
> diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
> index 0e1674a394b6..f333480f94e5 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -30,6 +30,7 @@
> #include "xe_map.h"
> #include "xe_mmio.h"
> #include "xe_wa.h"
> +#include "xe_wedge.h"
>
> /* Slack of a few additional entries per engine */
> #define ADS_REGSET_EXTRA_MAX 8
> @@ -544,7 +545,7 @@ static void guc_policies_init(struct xe_guc_ads *ads)
> ads_blob_write(ads, policies.max_num_work_items,
> GLOBAL_POLICY_MAX_NUM_WI);
>
> - if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)
> + if (xe_wedge_mode_is_no_reset(xe))
> global_flags |= GLOBAL_POLICY_DISABLE_ENGINE_RESET;
>
> ads_blob_write(ads, policies.global_flags, global_flags);
> diff --git a/drivers/gpu/drm/xe/xe_guc_capture.c b/drivers/gpu/drm/xe/xe_guc_capture.c
> index 0fd68b41d412..e528b3e9d158 100644
> --- a/drivers/gpu/drm/xe/xe_guc_capture.c
> +++ b/drivers/gpu/drm/xe/xe_guc_capture.c
> @@ -35,6 +35,7 @@
> #include "xe_map.h"
> #include "xe_mmio.h"
> #include "xe_sched_job.h"
> +#include "xe_wedge.h"
>
> /*
> * struct __guc_capture_bufstate
> @@ -1962,7 +1963,7 @@ xe_guc_capture_get_matching_and_lock(struct xe_exec_queue *q)
>
> xe = gt_to_xe(q->gt);
>
> - if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)
> + if (xe_wedge_mode_is_no_reset(xe))
> return NULL;
>
> if (!xe_device_uc_enabled(xe))
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
> index b5c916a764db..0aec902d0ef5 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -1435,7 +1435,7 @@ void xe_guc_submit_wedge(struct xe_guc *guc)
> if (!guc->submission_state.initialized)
> return;
>
> - if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET) {
> + if (xe_wedge_mode_is_no_reset(xe)) {
> mutex_lock(&guc->submission_state.lock);
> xa_for_each(&guc->submission_state.exec_queue_lookup, index, q)
> if (xe_exec_queue_get_unless_zero(q))
> @@ -1455,7 +1455,7 @@ static bool guc_submit_hint_wedged(struct xe_guc *guc)
> {
> struct xe_device *xe = guc_to_xe(guc);
>
> - if (xe->wedged.mode != XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)
> + if (!xe_wedge_mode_is_no_reset(xe))
> return false;
>
> if (xe_wedged(xe))
> diff --git a/drivers/gpu/drm/xe/xe_pci_error.c b/drivers/gpu/drm/xe/xe_pci_error.c
> index d288bb291aa1..fc6ff71d84a0 100644
> --- a/drivers/gpu/drm/xe/xe_pci_error.c
> +++ b/drivers/gpu/drm/xe/xe_pci_error.c
> @@ -179,7 +179,7 @@ static pci_ers_result_t xe_pci_error_mmio_enabled(struct pci_dev *pdev)
> action = xe_ras_process_errors(xe);
>
> /* User wants to debug the error, prevent reset */
> - if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET) {
> + if (xe_wedge_mode_is_no_reset(xe)) {
> xe_wedge_declare(xe, DRM_WEDGE_RECOVERY_NONE);
> return PCI_ERS_RESULT_DISCONNECT;
> }
> diff --git a/drivers/gpu/drm/xe/xe_wedge.c b/drivers/gpu/drm/xe/xe_wedge.c
> index 827fae058976..e48cca34d660 100644
> --- a/drivers/gpu/drm/xe/xe_wedge.c
> +++ b/drivers/gpu/drm/xe/xe_wedge.c
> @@ -157,7 +157,7 @@ void xe_wedge_declare(struct xe_device *xe, unsigned long method)
> * hangs, so wedge the device with 'none' recovery method and have
> * it available to the user for debugging.
> */
> - if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)
> + if (xe_wedge_mode_is_no_reset(xe))
> xe->wedged.method = DRM_WEDGE_RECOVERY_NONE;
> else
> xe->wedged.method = method;
> @@ -203,8 +203,7 @@ static bool wedge_mode_needs_policy_update(struct xe_device *xe, enum xe_wedged_
> if (xe->wedged.mode == mode)
> return false;
>
> - if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET ||
> - mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)
> + if (xe_wedge_mode_is_no_reset(xe) || mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)
> return true;
>
> return false;
> diff --git a/drivers/gpu/drm/xe/xe_wedge.h b/drivers/gpu/drm/xe/xe_wedge.h
> index f2cab855db35..edb5174c5a75 100644
> --- a/drivers/gpu/drm/xe/xe_wedge.h
> +++ b/drivers/gpu/drm/xe/xe_wedge.h
> @@ -26,6 +26,11 @@ static inline bool xe_wedged_permanent(struct xe_device *xe)
> return atomic_read(&xe->wedged.perm);
> }
>
> +static inline bool xe_wedge_mode_is_no_reset(struct xe_device *xe)
> +{
> + return xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET;
> +}
> +
> void xe_wedge_declare(struct xe_device *xe, unsigned long method);
> int xe_wedge_init(struct xe_device *xe);
> int xe_wedge_set_mode(struct xe_device *xe, enum xe_wedged_mode mode);
next prev parent reply other threads:[~2026-11-20 9:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 10:22 [PATCH v4 0/2] Protect drm_ras against unplugged or wedged device Raag Jadav
2026-11-19 10:22 ` [PATCH v4 1/2] drm/xe/drm_ras: Protect " Raag Jadav
2026-11-19 10:22 ` [PATCH v4 2/2] drm/xe/wedge: Introduce xe_wedge_mode_is_no_reset() Raag Jadav
2026-11-20 9:25 ` Tauro, Riana [this message]
2026-11-19 11:30 ` ✓ CI.KUnit: success for Protect drm_ras against unplugged or wedged device (rev3) Patchwork
2026-11-19 12:26 ` ✓ Xe.CI.BAT: " Patchwork
2026-11-20 18:24 ` ✓ Xe.CI.FULL: " 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=689afa8d-99e8-4eeb-8d53-4e5bdda788e3@intel.com \
--to=riana.tauro@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=raag.jadav@intel.com \
--cc=stuart.summers@intel.com \
/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.