From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: <intel-xe@lists.freedesktop.org>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH 2/3] drm/xe: declare wedged and abort probe upon GuC load failure
Date: Wed, 13 Mar 2024 15:54:58 -0400 [thread overview]
Message-ID: <20240313195459.141463-2-rodrigo.vivi@intel.com> (raw)
In-Reply-To: <20240313195459.141463-1-rodrigo.vivi@intel.com>
Let's block the probe or any other sequence and declare device wedged
upon any GuC load failure.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/xe/xe_guc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
index caa86ccbe9e7..10d0f9418b11 100644
--- a/drivers/gpu/drm/xe/xe_guc.c
+++ b/drivers/gpu/drm/xe/xe_guc.c
@@ -511,6 +511,8 @@ static int guc_wait_ucode(struct xe_guc *guc)
SOFT_SCRATCH(13)));
ret = -ENXIO;
}
+
+ xe_device_declare_wedged(xe);
} else {
drm_dbg(&xe->drm, "GuC successfully loaded");
}
@@ -554,7 +556,7 @@ static int __xe_guc_upload(struct xe_guc *guc)
out:
xe_uc_fw_change_status(&guc->fw, XE_UC_FIRMWARE_LOAD_FAIL);
- return 0 /* FIXME: ret, don't want to stop load currently */;
+ return ret;
}
/**
--
2.44.0
next prev parent reply other threads:[~2024-03-13 19:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 19:54 [PATCH 1/3] drm/xe: Introduce a simple wedged state Rodrigo Vivi
2024-03-13 19:54 ` Rodrigo Vivi [this message]
2024-03-13 19:54 ` [PATCH 3/3] drm/xe: Force wedged state and block GT reset upon any GPU hang Rodrigo Vivi
2024-03-13 20:49 ` Lucas De Marchi
2024-03-13 20:56 ` Somaiya, Himanshu
2024-03-13 21:44 ` Rodrigo Vivi
2024-03-13 21:54 ` Lucas De Marchi
2024-03-13 22:06 ` Rodrigo Vivi
2024-03-14 4:00 ` Lucas De Marchi
2024-03-15 1:06 ` Rodrigo Vivi
2024-03-15 6:28 ` Teres Alexis, Alan Previn
2024-03-13 20:00 ` ✓ CI.Patch_applied: success for series starting with [1/3] drm/xe: Introduce a simple wedged state Patchwork
2024-03-13 20:01 ` ✗ CI.checkpatch: warning " Patchwork
2024-03-13 20:01 ` ✓ CI.KUnit: success " Patchwork
2024-03-13 20:12 ` ✓ CI.Build: " Patchwork
2024-03-13 20:16 ` ✓ CI.Hooks: " Patchwork
2024-03-13 20:18 ` ✓ CI.checksparse: " Patchwork
2024-03-13 20:27 ` [PATCH 1/3] " Lucas De Marchi
2024-03-13 21:40 ` Rodrigo Vivi
2024-03-13 20:39 ` ✓ CI.BAT: success for series starting with [1/3] " Patchwork
2024-03-14 1:40 ` [PATCH 1/3] " Aravind Iddamsetty
2024-03-14 3:33 ` Aravind Iddamsetty
2024-03-14 18:53 ` Rodrigo Vivi
2024-03-15 7:01 ` Aravind Iddamsetty
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=20240313195459.141463-2-rodrigo.vivi@intel.com \
--to=rodrigo.vivi@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox