diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 801dd155d1f0..58bb7e4fad3b 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -78,6 +78,7 @@ i915-$(CONFIG_PERF_EVENTS) += \
 i915-y += \
 	i915_display_pc8.o \
 	i915_hdcp_gsc.o \
+	i915_initial_plane.o \
 	i915_panic.o
 
 # "Graphics Technology" (aka we talk to the gpu)
@@ -301,7 +302,6 @@ i915-y += \
 	display/intel_pch_display.o \
 	display/intel_pch_refclk.o \
 	display/intel_plane.o \
-	display/intel_plane_initial.o \
 	display/intel_pmdemand.o \
 	display/intel_psr.o \
 	display/intel_quirks.o \
diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/i915_initial_plane.c
similarity index 97%
rename from drivers/gpu/drm/i915/display/intel_plane_initial.c
rename to drivers/gpu/drm/i915/i915_initial_plane.c
index ff1afd3a8f20..87c964485a41 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/i915_initial_plane.c
@@ -5,17 +5,18 @@
 
 #include <drm/drm_print.h>
 
+#include "display/intel_crtc.h"
+#include "display/intel_display.h"
+#include "display/intel_display_core.h"
+#include "display/intel_display_types.h"
+#include "display/intel_fb.h"
+#include "display/intel_frontbuffer.h"
+#include "display/intel_plane.h"
+#include "display/intel_plane_initial.h"
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_region.h"
+
 #include "i915_drv.h"
-#include "intel_crtc.h"
-#include "intel_display.h"
-#include "intel_display_core.h"
-#include "intel_display_types.h"
-#include "intel_fb.h"
-#include "intel_frontbuffer.h"
-#include "intel_plane.h"
-#include "intel_plane_initial.h"
 
 void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
 {