From: Maarten Lankhorst Date: Tue, 21 Jan 2025 14:28:49 +0000 (+0100) Subject: drm/xe: Defer irq init until after xe_display_init_noaccel X-Git-Tag: v6.15-rc1~120^2~15^2~63 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f595fe5f6ae7d74d7352e2577ca1577704b64b3b;p=thirdparty%2Fkernel%2Flinux.git drm/xe: Defer irq init until after xe_display_init_noaccel As stated in previous commit, we have to move interrupt handling until after xe_display_init_noaccel, as using memirqs would require an allocation. A full solution will of course require memirq allocation to be moved, but the first part only focuses on the required changes to display. Reviewed-by: Ilia Levi Link: https://patchwork.freedesktop.org/patch/msgid/20250121142850.4960-2-dev@lankhorst.se Signed-off-by: Maarten Lankhorst --- diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 8fedc72e9db40..4d401e4da70b9 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -814,10 +814,6 @@ int xe_device_probe(struct xe_device *xe) if (err) return err; - err = xe_irq_install(xe); - if (err) - goto err; - err = probe_has_flat_ccs(xe); if (err) goto err; @@ -851,6 +847,10 @@ int xe_device_probe(struct xe_device *xe) goto err; } + err = xe_irq_install(xe); + if (err) + goto err; + for_each_gt(gt, xe, id) { last_gt = id;