[PATCH 3/3] drm/i915/de: Nuke intel_de_{read,write}_notrace()

[Ville Syrjala <ville.syrjala@linux.intel.com>]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

intel_de_{read,write}_notrace() are now completely unused,
so nuke them. Reducing the number of different register
access functions should help a bit with cleaning up the
final uncore mess between xe vs. i915.

And with this we can also nuke the corresponding xe uncore
compat wrappers.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_de.h          | 12 ------------
 .../drm/xe/compat-i915-headers/intel_uncore.h    | 16 ----------------
 2 files changed, 28 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h
index 8144588d3cf7..4ae041a96b31 100644
--- a/drivers/gpu/drm/i915/display/intel_de.h
+++ b/drivers/gpu/drm/i915/display/intel_de.h
@@ -164,18 +164,6 @@ intel_de_posting_read_fw(struct intel_display *display, intel_reg_t reg)
 	intel_de_read_fw(display, reg);
 }
 
-static inline u32
-intel_de_read_notrace(struct intel_display *display, intel_reg_t reg)
-{
-	return intel_uncore_read_notrace(__to_uncore(display), reg);
-}
-
-static inline void
-intel_de_write_notrace(struct intel_display *display, intel_reg_t reg, u32 val)
-{
-	intel_uncore_write_notrace(__to_uncore(display), reg, val);
-}
-
 static __always_inline void
 intel_de_write_dsb(struct intel_display *display, struct intel_dsb *dsb,
 		   intel_reg_t reg, u32 val)
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
index 08d7ab933672..b8ea8f5b22d1 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
@@ -114,22 +114,6 @@ static inline void intel_uncore_write_fw(struct intel_uncore *uncore,
 	xe_mmio_write32(__compat_uncore_to_mmio(uncore), reg, val);
 }
 
-static inline u32 intel_uncore_read_notrace(struct intel_uncore *uncore,
-					    i915_reg_t i915_reg)
-{
-	struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
-
-	return xe_mmio_read32(__compat_uncore_to_mmio(uncore), reg);
-}
-
-static inline void intel_uncore_write_notrace(struct intel_uncore *uncore,
-					      i915_reg_t i915_reg, u32 val)
-{
-	struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
-
-	xe_mmio_write32(__compat_uncore_to_mmio(uncore), reg, val);
-}
-
 static inline bool
 intel_uncore_arm_unclaimed_mmio_detection(struct intel_uncore *uncore)
 {
-- 
2.54.0