github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-14 16:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Couple commits cleaning up error messages.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmqHEfYACgkQ+mJfZA7r
 E8otogf+OCYHJVwJr36pgtcvuk2PtpvtqEpKkW1wx2c9JWIVOBgtY/TYrAY9G6tM
 HS+fFxT4zsr0sZpQNFbMP2KwIwKGDT0eats8Pc1M6OEMv2HO2X8EYwWHSXSMx2ky
 cEgVAP5/6/1SkGvyVzhATO4e1o69WY8h0patFS4SyF/87kHJyRm2WbId3Mp9q/YX
 DvjcD3TC4GgO1IleR2pkBOjeTn2XdFBkKFVQjiq0ywFXBXViRe9xQ9DJ+1w5mwpi
 YvJ6MkNLMN86WOJRzKxxR1dxlChSLwaknSATcmcWgGI/UjhB9Xtz/owGq6Vbb/1P
 9WRcwuRE9c7WCpfaW4Lt+5roXKGKtQ==
 =ULbi
 -----END PGP SIGNATURE-----

Merge tag 'drm-xe-next-fixes-2026-08-20' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next

Couple commits cleaning up error messages.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/aocSC19By5UIIbTZ@intel.com
This commit is contained in:
Dave Airlie 2026-08-24 11:40:14 +10:00
commit 1ff8d3e316
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/xe/tests/xe_migrate.c
View File

@ -198,8 +198,7 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test,
err = xe_bo_vmap(bo);
if (err) {
KUNIT_FAIL(test, "Failed to vmap our pagetables: %li\n",
PTR_ERR(bo));
KUNIT_FAIL(test, "Failed to vmap our pagetables: %d\n", err);
return;
}

6
drivers/gpu/drm/xe/xe_guc_submit.c
View File

@ -1559,8 +1559,14 @@ guc_exec_queue_timedout_job(struct drm_sched_job *drm_job)
if (!skip_timeout_check && !check_timeout(q, job))
goto rearm;
/*
* Killed queues must not newly wedge the device, but preserve an
* already-wedged state to avoid warning on teardown timeouts.
*/
if (!exec_queue_killed(q))
wedged = guc_submit_hint_wedged(exec_queue_to_guc(q));
else
wedged = xe_device_wedged(xe);
set_exec_queue_banned(q);