Reviewed-by: Ilia Levi <ilia.levi@intel.com>We want to merge xe_display_init_noirq and xe_display_init_noaccel, by not enabling interrupts in between, this should be safe to do. Signed-off-by: Maarten Lankhorst <dev@lankhorst.se> --- drivers/gpu/drm/xe/xe_device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index c1b4601a14779..fbec176ee64ad 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -701,10 +701,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;
@@ -738,6 +734,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;