[Intel-xe] [PATCH 2/8] drm/i915/display: drop redundant display/ from includes

Jani Nikula jani.nikula at intel.com
Thu Mar 2 14:12:24 UTC 2023


Already done in upstream i915.

Note: This would be dropped when rebasing against upstream.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 48 ++++++++++----------
 drivers/gpu/drm/i915/display/intel_psr.c     |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 5a0a8179b0dc..81c50b6f1b5e 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -45,32 +45,32 @@
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_rect.h>
 
-#include "display/intel_audio.h"
-#include "display/intel_backlight.h"
-#include "display/intel_ddi.h"
-#include "display/intel_display_debugfs.h"
-#include "display/intel_display_power.h"
-#include "display/intel_dp.h"
-#include "display/intel_dp_mst.h"
-#include "display/intel_dpll.h"
-#include "display/intel_dpll_mgr.h"
-#include "display/intel_drrs.h"
-#include "display/intel_dsb.h"
-#include "display/intel_dsi.h"
-#include "display/intel_fb.h"
-#include "display/intel_gmbus.h"
-#include "display/intel_hdmi.h"
-#include "display/intel_lvds.h"
-#include "display/intel_snps_phy.h"
-#include "display/intel_vdsc.h"
-#include "display/intel_vrr.h"
+#include "intel_audio.h"
+#include "intel_backlight.h"
+#include "intel_ddi.h"
+#include "intel_display_debugfs.h"
+#include "intel_display_power.h"
+#include "intel_dp.h"
+#include "intel_dp_mst.h"
+#include "intel_dpll.h"
+#include "intel_dpll_mgr.h"
+#include "intel_drrs.h"
+#include "intel_dsb.h"
+#include "intel_dsi.h"
+#include "intel_fb.h"
+#include "intel_gmbus.h"
+#include "intel_hdmi.h"
+#include "intel_lvds.h"
+#include "intel_snps_phy.h"
+#include "intel_vdsc.h"
+#include "intel_vrr.h"
 
 #ifdef I915
-#include "display/intel_crt.h"
-#include "display/intel_dvo.h"
-#include "display/intel_overlay.h"
-#include "display/intel_sdvo.h"
-#include "display/intel_tv.h"
+#include "intel_crt.h"
+#include "intel_dvo.h"
+#include "intel_overlay.h"
+#include "intel_sdvo.h"
+#include "intel_tv.h"
 
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_object.h"
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index bc998b526d88..195ddafdb522 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -24,7 +24,7 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_damage_helper.h>
 
-#include "display/intel_dp.h"
+#include "intel_dp.h"
 
 #include "i915_drv.h"
 #include "i915_reg.h"
-- 
2.39.1



More information about the Intel-xe mailing list