diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index eafe2f093a6c..e2e0771cf274 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -93,7 +93,7 @@ static void xe_display_fini_early(void *arg)
 	struct xe_device *xe = arg;
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	intel_display_driver_remove_nogem(display);
@@ -107,7 +107,7 @@ int xe_display_init_early(struct xe_device *xe)
 	struct intel_display *display = xe->display;
 	int err;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return 0;
 
 	/* Fake uncore lock */
@@ -163,7 +163,7 @@ int xe_display_init(struct xe_device *xe)
 	struct intel_display *display = xe->display;
 	int err;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return 0;
 
 	err = intel_display_driver_probe(display);
@@ -177,7 +177,7 @@ void xe_display_register(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	intel_display_driver_register(display);
@@ -188,7 +188,7 @@ void xe_display_unregister(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	intel_power_domains_disable(display);
@@ -201,7 +201,7 @@ void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	if (master_ctl & DISPLAY_IRQ)
@@ -212,7 +212,7 @@ void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	if (gu_misc_iir & GU_MISC_GSE)
@@ -223,7 +223,7 @@ void xe_display_irq_reset(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	gen11_display_irq_reset(display);
@@ -233,7 +233,7 @@ void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	if (gt->info.id == XE_GT0)
@@ -274,7 +274,7 @@ static void xe_display_enable_d3cold(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	/*
@@ -297,7 +297,7 @@ static void xe_display_disable_d3cold(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	intel_dmc_resume(display);
@@ -322,7 +322,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
 	struct intel_display *display = xe->display;
 	bool s2idle = suspend_to_idle();
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	/*
@@ -356,7 +356,7 @@ void xe_display_pm_shutdown(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	intel_power_domains_disable(display);
@@ -387,7 +387,7 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	if (xe->d3cold.allowed) {
@@ -403,7 +403,7 @@ void xe_display_pm_suspend_late(struct xe_device *xe)
 	struct intel_display *display = xe->display;
 	bool s2idle = suspend_to_idle();
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	intel_display_power_suspend_late(display, s2idle);
@@ -413,7 +413,7 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	if (xe->d3cold.allowed)
@@ -431,7 +431,7 @@ void xe_display_pm_shutdown_late(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	/*
@@ -446,7 +446,7 @@ void xe_display_pm_resume_early(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	intel_display_power_resume_early(display);
@@ -456,7 +456,7 @@ void xe_display_pm_resume(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	intel_dmc_resume(display);
@@ -491,7 +491,7 @@ void xe_display_pm_runtime_resume(struct xe_device *xe)
 {
 	struct intel_display *display = xe->display;
 
-	if (!display)
+	if (!xe->info.probe_display)
 		return;
 
 	if (xe->d3cold.allowed) {