[Intel-xe] [PATCH 20/21] fixup! drm/i915/display: Remaining changes to make xe compile

Jani Nikula jani.nikula at intel.com
Wed Apr 5 15:39:19 UTC 2023


Remove intel overlay ifdefs

No longer needed with intel_overlay.h having conditional build.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index cb14c201cc17..24c96f388d52 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -48,7 +48,6 @@
 #ifdef I915
 #include "intel_crt.h"
 #include "intel_dvo.h"
-#include "intel_overlay.h"
 #include "intel_sdvo.h"
 #include "intel_tv.h"
 
@@ -109,6 +108,7 @@
 #include "intel_lvds_regs.h"
 #include "intel_modeset_setup.h"
 #include "intel_modeset_verify.h"
+#include "intel_overlay.h"
 #include "intel_panel.h"
 #include "intel_pch_display.h"
 #include "intel_pch_refclk.h"
-- 
2.39.2



More information about the Intel-xe mailing list