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

Jani Nikula jani.nikula at intel.com
Wed May 3 13:09:53 UTC 2023


Use i915/display/intel_de.h for real.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/display/intel_de.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h
index 5c223ff6b3ec..22907719bb1e 100644
--- a/drivers/gpu/drm/i915/display/intel_de.h
+++ b/drivers/gpu/drm/i915/display/intel_de.h
@@ -3,9 +3,6 @@
  * Copyright © 2019 Intel Corporation
  */
 
-#ifdef BUILD_FOR_XE
-#include_next "intel_de.h"
-#else
 #ifndef __INTEL_DE_H__
 #define __INTEL_DE_H__
 
@@ -177,4 +174,3 @@ static inline int intel_de_pcode_request(struct drm_i915_private *i915, u32 mbox
 }
 
 #endif /* __INTEL_DE_H__ */
-#endif
-- 
2.39.2



More information about the Intel-xe mailing list