drm/i915/tdf: convert intel_tdf.[ch] to struct intel_display

Going forward, struct intel_display is the main display device data
pointer. Convert the intel_tdf.[ch] glue to struct intel_display.

Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/26d976f23295713f9a7cda20e32b7ef5aad3dd9e.1740502116.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index ab33792c98402133d939e1b3c8cd7d9c45877241..5ede3ee2543f437a6badf6faaee872c8f4a386ba 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7425,7 +7425,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
 
        intel_atomic_commit_fence_wait(state);
 
-       intel_td_flush(dev_priv);
+       intel_td_flush(display);
 
        intel_atomic_prepare_plane_clear_colors(state);
 

diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
index 26128c610cb4a2e938c525686e8f5963782fad7c..2fa4b0bf27c3d7fc6e6c610d132ec01c59517ae4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@ -98,7 +98,7 @@ static void frontbuffer_flush(struct drm_i915_private *i915,
        trace_intel_frontbuffer_flush(display, frontbuffer_bits, origin);
 
        might_sleep();
-       intel_td_flush(i915);
+       intel_td_flush(display);
        intel_drrs_flush(i915, frontbuffer_bits);
        intel_psr_flush(display, frontbuffer_bits, origin);
        intel_fbc_flush(i915, frontbuffer_bits, origin);

diff --git a/drivers/gpu/drm/i915/display/intel_tdf.h b/drivers/gpu/drm/i915/display/intel_tdf.h
index 353cde21f6c23004fe6eb04aacf4308b399c0a5b..0862c2bfd9cd363812c57a0d055cdeb40a58a8bb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tdf.h
+++ b/drivers/gpu/drm/i915/display/intel_tdf.h
@@ -14,12 +14,12 @@
  * the display flip, since display engine is never coherent with CPU/GPU caches.
  */
 
-struct drm_i915_private;
+struct intel_display;
 
 #ifdef I915
-static inline void intel_td_flush(struct drm_i915_private *i915) {}
+static inline void intel_td_flush(struct intel_display *display) {}
 #else
-void intel_td_flush(struct drm_i915_private *i915);
+void intel_td_flush(struct intel_display *display);
 #endif
 
 #endif

diff --git a/drivers/gpu/drm/xe/display/xe_tdf.c b/drivers/gpu/drm/xe/display/xe_tdf.c
index 2c0d4e144e09ddda6ce594ddf7df49ed1f1661b4..2a7fccbeb1d55975f6d19ca068e2f2bdec4dc2dd 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_tdf.c
+++ b/drivers/gpu/drm/xe/display/xe_tdf.c
@@ -7,7 +7,9 @@
 #include "intel_display_types.h"
 #include "intel_tdf.h"
 
-void intel_td_flush(struct drm_i915_private *i915)
+void intel_td_flush(struct intel_display *display)
 {
-       xe_device_td_flush(i915);
+       struct xe_device *xe = to_xe_device(display->drm);
+
+       xe_device_td_flush(xe);
 }