[Intel-xe] [PATCH v2 4/8] drm/xe: drop redundant display/ from includes

[Jani Nikula]

Drop display/ prefix when not needed. We have -I for xe/display and
i915/display subdirectories.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/xe/display/ext/i915_irq.c     | 16 ++++++------
 .../drm/xe/display/ext/intel_device_info.c    |  4 +--
 drivers/gpu/drm/xe/display/ext/intel_pm.c     |  6 ++---
 drivers/gpu/drm/xe/display/i915_drv.h         |  2 +-
 drivers/gpu/drm/xe/xe_device_types.h          |  6 ++---
 drivers/gpu/drm/xe/xe_display.c               | 26 +++++++++----------
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/ext/i915_irq.c b/drivers/gpu/drm/xe/display/ext/i915_irq.c
index ca188e69f509..60950cfaf6dc 100644
--- a/drivers/gpu/drm/xe/display/ext/i915_irq.c
+++ b/drivers/gpu/drm/xe/display/ext/i915_irq.c
@@ -34,14 +34,14 @@
 
 #include <drm/drm_drv.h>
 
-#include "display/icl_dsi_regs.h"
-#include "display/intel_de.h"
-#include "display/intel_display_trace.h"
-#include "display/intel_display_types.h"
-#include "display/intel_fifo_underrun.h"
-#include "display/intel_hotplug.h"
-#include "display/intel_lpe_audio.h"
-#include "display/intel_psr.h"
+#include "icl_dsi_regs.h"
+#include "intel_de.h"
+#include "intel_display_trace.h"
+#include "intel_display_types.h"
+#include "intel_fifo_underrun.h"
+#include "intel_hotplug.h"
+#include "intel_lpe_audio.h"
+#include "intel_psr.h"
 
 #include "i915_drv.h"
 #include "../intel_de.h"
diff --git a/drivers/gpu/drm/xe/display/ext/intel_device_info.c b/drivers/gpu/drm/xe/display/ext/intel_device_info.c
index 318b27a357b8..6311b8494e4d 100644
--- a/drivers/gpu/drm/xe/display/ext/intel_device_info.c
+++ b/drivers/gpu/drm/xe/display/ext/intel_device_info.c
@@ -22,8 +22,8 @@
  *
  */
 
-#include "display/intel_cdclk.h"
-#include "display/intel_de.h"
+#include "intel_cdclk.h"
+#include "intel_de.h"
 #include "gt/intel_gt_regs.h"
 #include "intel_device_info.h"
 #include "i915_drv.h"
diff --git a/drivers/gpu/drm/xe/display/ext/intel_pm.c b/drivers/gpu/drm/xe/display/ext/intel_pm.c
index b5c5b57f4a11..b9cd063e2d21 100644
--- a/drivers/gpu/drm/xe/display/ext/intel_pm.c
+++ b/drivers/gpu/drm/xe/display/ext/intel_pm.c
@@ -25,9 +25,9 @@
  *
  */
 
-#include "display/intel_de.h"
-#include "display/intel_display_trace.h"
-#include "display/skl_watermark.h"
+#include "intel_de.h"
+#include "intel_display_trace.h"
+#include "skl_watermark.h"
 
 #include "i915_drv.h"
 #include "intel_mchbar_regs.h"
diff --git a/drivers/gpu/drm/xe/display/i915_drv.h b/drivers/gpu/drm/xe/display/i915_drv.h
index 06348cb03f44..f5b36197e29d 100644
--- a/drivers/gpu/drm/xe/display/i915_drv.h
+++ b/drivers/gpu/drm/xe/display/i915_drv.h
@@ -179,7 +179,7 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev)
 #define intel_overlay_cleanup(a) do { (void)a; } while (0)
 #define intel_overlay_setup(a) do { (void)a; } while (0)
 
-#include "display/intel_wakeref.h"
+#include "intel_wakeref.h"
 
 static inline bool intel_runtime_pm_get(struct xe_runtime_pm *pm)
 {
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 199bd37fce9a..034e0956f4ea 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -17,9 +17,9 @@
 #include "xe_step_types.h"
 
 #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
-#include "display/ext/intel_device_info.h"
-#include "display/ext/intel_pch.h"
-#include "display/intel_display_core.h"
+#include "ext/intel_device_info.h"
+#include "ext/intel_pch.h"
+#include "intel_display_core.h"
 #endif
 
 #define XE_BO_INVALID_OFFSET	LONG_MAX
diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c
index 97c77d175539..1ec0a7ccbce1 100644
--- a/drivers/gpu/drm/xe/xe_display.c
+++ b/drivers/gpu/drm/xe/xe_display.c
@@ -14,19 +14,19 @@
 #include <drm/drm_managed.h>
 #include <drm/xe_drm.h>
 
-#include "display/ext/i915_irq.h"
-#include "display/ext/intel_dram.h"
-#include "display/ext/intel_pm.h"
-#include "display/intel_acpi.h"
-#include "display/intel_audio.h"
-#include "display/intel_bw.h"
-#include "display/intel_display.h"
-#include "display/intel_display_types.h"
-#include "display/intel_dp.h"
-#include "display/intel_fbdev.h"
-#include "display/intel_hdcp.h"
-#include "display/intel_hotplug.h"
-#include "display/intel_opregion.h"
+#include "ext/i915_irq.h"
+#include "ext/intel_dram.h"
+#include "ext/intel_pm.h"
+#include "intel_acpi.h"
+#include "intel_audio.h"
+#include "intel_bw.h"
+#include "intel_display.h"
+#include "intel_display_types.h"
+#include "intel_dp.h"
+#include "intel_fbdev.h"
+#include "intel_hdcp.h"
+#include "intel_hotplug.h"
+#include "intel_opregion.h"
 #include "xe_module.h"
 
 /* Xe device functions */
-- 
2.39.1