diff options
| author | Dave Airlie <airlied@redhat.com> | 2026-08-24 11:40:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2026-08-24 11:40:23 +1000 |
| commit | 1ff8d3e3165fd077faa4259fd232bdddcd30249f (patch) | |
| tree | ae0bc37de59b782630f4018dda7d6bc9fb8658dc /drivers | |
| parent | e91d58cb2f470fe15bd4e02a26d44e9aaf771346 (diff) | |
| parent | 13087ad7817e6e5f210064518bfc4d6d58a9c2f3 (diff) | |
| download | linux-1ff8d3e3165fd077faa4259fd232bdddcd30249f.tar.gz linux-1ff8d3e3165fd077faa4259fd232bdddcd30249f.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/xe/tests/xe_migrate.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_submit.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/tests/xe_migrate.c b/drivers/gpu/drm/xe/tests/xe_migrate.c index 3c1be809be82..f10d9513747b 100644 --- a/drivers/gpu/drm/xe/tests/xe_migrate.c +++ b/drivers/gpu/drm/xe/tests/xe_migrate.c @@ -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; } diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 8aaed4fd13ea..864859bd0ccc 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -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); |