drm/xe: move xe_display.[ch] under display/

All the other display related files are under display/ subdirectory,
also move xe_display.[ch] there.

Sort the build list while at it.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240122101428.2683468-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index abb2be8268d0dfe64cf8f9a4209644c63239f161..f017a59bf01f36b8deefacf3df7b0e67a005d201 100644 (file)
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -185,17 +185,17 @@ $(obj)/i915-display/%.o: $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE
 
 # Display code specific to xe
 xe-$(CONFIG_DRM_XE_DISPLAY) += \
-       xe_display.o \
-       display/xe_fb_pin.o \
-       display/xe_hdcp_gsc.o \
-       display/xe_plane_initial.o \
-       display/xe_display_rps.o \
+       display/ext/i915_irq.o \
+       display/ext/i915_utils.o \
+       display/intel_fb_bo.o \
+       display/intel_fbdev_fb.o \
+       display/xe_display.o \
        display/xe_display_misc.o \
+       display/xe_display_rps.o \
        display/xe_dsb_buffer.o \
-       display/intel_fbdev_fb.o \
-       display/intel_fb_bo.o \
-       display/ext/i915_irq.o \
-       display/ext/i915_utils.o
+       display/xe_fb_pin.o \
+       display/xe_hdcp_gsc.o \
+       display/xe_plane_initial.o
 
 # SOC code shared with i915
 xe-$(CONFIG_DRM_XE_DISPLAY) += \

diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
similarity index 100%
rename from drivers/gpu/drm/xe/xe_display.c
rename to drivers/gpu/drm/xe/display/xe_display.c

diff --git a/drivers/gpu/drm/xe/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h
similarity index 100%
rename from drivers/gpu/drm/xe/xe_display.h
rename to drivers/gpu/drm/xe/display/xe_display.h