Skip to content

Commit 619a114

Browse files
committed
Merge tag 'drm-xe-fixes-2025-02-20' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes
- Fix error handling in xe_irq_install (Lucas) - Fix devcoredump format (Jose, Lucas) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/Z7dePS3a9POnjrVL@intel.com
2 parents 395436f + 213e242 commit 619a114

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

drivers/gpu/drm/xe/xe_guc_ct.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,9 +1723,11 @@ void xe_guc_ct_snapshot_print(struct xe_guc_ct_snapshot *snapshot,
17231723
drm_printf(p, "\tg2h outstanding: %d\n",
17241724
snapshot->g2h_outstanding);
17251725

1726-
if (snapshot->ctb)
1727-
xe_print_blob_ascii85(p, "CTB data", '\n',
1726+
if (snapshot->ctb) {
1727+
drm_printf(p, "[CTB].length: 0x%zx\n", snapshot->ctb_size);
1728+
xe_print_blob_ascii85(p, "[CTB].data", '\n',
17281729
snapshot->ctb, 0, snapshot->ctb_size);
1730+
}
17291731
} else {
17301732
drm_puts(p, "CT disabled\n");
17311733
}

drivers/gpu/drm/xe/xe_guc_log.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,11 @@ void xe_guc_log_snapshot_print(struct xe_guc_log_snapshot *snapshot, struct drm_
208208
drm_printf(p, "GuC timestamp: 0x%08llX [%llu]\n", snapshot->stamp, snapshot->stamp);
209209
drm_printf(p, "Log level: %u\n", snapshot->level);
210210

211+
drm_printf(p, "[LOG].length: 0x%zx\n", snapshot->size);
211212
remain = snapshot->size;
212213
for (i = 0; i < snapshot->num_chunks; i++) {
213214
size_t size = min(GUC_LOG_CHUNK_SIZE, remain);
214-
const char *prefix = i ? NULL : "Log data";
215+
const char *prefix = i ? NULL : "[LOG].data";
215216
char suffix = i == snapshot->num_chunks - 1 ? '\n' : 0;
216217

217218
xe_print_blob_ascii85(p, prefix, suffix, snapshot->copy[i], 0, size);

drivers/gpu/drm/xe/xe_irq.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -757,19 +757,7 @@ int xe_irq_install(struct xe_device *xe)
757757

758758
xe_irq_postinstall(xe);
759759

760-
err = devm_add_action_or_reset(xe->drm.dev, irq_uninstall, xe);
761-
if (err)
762-
goto free_irq_handler;
763-
764-
return 0;
765-
766-
free_irq_handler:
767-
if (xe_device_has_msix(xe))
768-
xe_irq_msix_free(xe);
769-
else
770-
xe_irq_msi_free(xe);
771-
772-
return err;
760+
return devm_add_action_or_reset(xe->drm.dev, irq_uninstall, xe);
773761
}
774762

775763
static void xe_irq_msi_synchronize_irq(struct xe_device *xe)

0 commit comments

Comments
 (0)