niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

- Fix error handling in xe_irq_install (Lucas)

Browse source 
- Fix devcoredump format (Jose, Lucas)
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAme3XboACgkQ+mJfZA7r
 E8rnhwf/S90/9C27PigMuq05uxmaiLCvhm8CVH6zAJzlbr7SB7Iv2C4yFHn+V00K
 oZ8TTEyxRcjCU5ADkPtitU+ElNH1MsDJDuCCkwiG0kf6T9uAwmyVsYLvFAftq/LR
 UwLSpIfdIud5YqVEQvHwmFuKc6ea+lsmMmoN1WV6AxV0hQh17sP9xK+Ji8CQA+NZ
 ZcI8u0ssFQnkgvR/lfrUqF+zV61zirQBgZOU54hpAZMJ95N7Er3cZJUnC6yVO9Yc
 gCDmA75uYkqcArqwmNsbSdiK0/KuBd7T6LAAeHWp9rkgfH8VHnTV5IoPGXloPC7G
 H7SCSRUt5ziarLIpR+IoLis0wI2LZA==
 =b6zI
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Dave Airlie 2025-02-21 10:42:31 +10:00
commit 619a1148c6
3 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/xe/xe_guc_ct.c
View file

@ -1723,9 +1723,11 @@ void xe_guc_ct_snapshot_print(struct xe_guc_ct_snapshot *snapshot,
drm_printf(p, "\tg2h outstanding: %d\n",
snapshot->g2h_outstanding);
if (snapshot->ctb)
xe_print_blob_ascii85(p, "CTB data", '\n',
if (snapshot->ctb) {
drm_printf(p, "[CTB].length: 0x%zx\n", snapshot->ctb_size);
xe_print_blob_ascii85(p, "[CTB].data", '\n',
snapshot->ctb, 0, snapshot->ctb_size);
}
} else {
drm_puts(p, "CT disabled\n");
}

3
drivers/gpu/drm/xe/xe_guc_log.c
View file

@ -208,10 +208,11 @@ void xe_guc_log_snapshot_print(struct xe_guc_log_snapshot *snapshot, struct drm_
drm_printf(p, "GuC timestamp: 0x%08llX [%llu]\n", snapshot->stamp, snapshot->stamp);
drm_printf(p, "Log level: %u\n", snapshot->level);
drm_printf(p, "[LOG].length: 0x%zx\n", snapshot->size);
remain = snapshot->size;
for (i = 0; i < snapshot->num_chunks; i++) {
size_t size = min(GUC_LOG_CHUNK_SIZE, remain);
const char *prefix = i ? NULL : "Log data";
const char *prefix = i ? NULL : "[LOG].data";
char suffix = i == snapshot->num_chunks - 1 ? '\n' : 0;
xe_print_blob_ascii85(p, prefix, suffix, snapshot->copy[i], 0, size);

14
drivers/gpu/drm/xe/xe_irq.c
View file

@ -757,19 +757,7 @@ int xe_irq_install(struct xe_device *xe)
xe_irq_postinstall(xe);
err = devm_add_action_or_reset(xe->drm.dev, irq_uninstall, xe);
if (err)
goto free_irq_handler;
return 0;
free_irq_handler:
if (xe_device_has_msix(xe))
xe_irq_msix_free(xe);
else
xe_irq_msi_free(xe);
return err;
return devm_add_action_or_reset(xe->drm.dev, irq_uninstall, xe);
}
static void xe_irq_msi_synchronize_irq(struct xe_device *xe)