drm/i915: Move intel_hpd_poll_fini() into intel_hotplug.c

The name of intel_hpd_poll_fini() suggests that it should live
in intel_hotplug.c. Make it so.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213150220.13580-6-ville.syrjala@linux.intel.com
Reviewed-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 de03d507397bcf70bfd55ca845f05a53c766753a..2784cdcb9841795ab6ee858ada630db6f3319ece 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -63,7 +63,6 @@
 #include "intel_cdclk.h"
 #include "intel_clock_gating.h"
 #include "intel_color.h"
-#include "intel_connector.h"
 #include "intel_crt.h"
 #include "intel_crtc.h"
 #include "intel_crtc_state_dump.h"
@@ -93,7 +92,6 @@
 #include "intel_fdi.h"
 #include "intel_fifo_underrun.h"
 #include "intel_frontbuffer.h"
-#include "intel_hdcp.h"
 #include "intel_hdmi.h"
 #include "intel_hotplug.h"
 #include "intel_link_bw.h"
@@ -8538,20 +8536,6 @@ void i830_disable_pipe(struct intel_display *display, enum pipe pipe)
        intel_de_posting_read(display, DPLL(display, pipe));
 }
 
-void intel_hpd_poll_fini(struct drm_i915_private *i915)
-{
-       struct intel_connector *connector;
-       struct drm_connector_list_iter conn_iter;
-
-       /* Kill all the work that may have been queued by hpd. */
-       drm_connector_list_iter_begin(&i915->drm, &conn_iter);
-       for_each_intel_connector_iter(connector, &conn_iter) {
-               intel_connector_cancel_modeset_retry_work(connector);
-               intel_hdcp_cancel_works(connector);
-       }
-       drm_connector_list_iter_end(&conn_iter);
-}
-
 bool intel_scanout_needs_vtd_wa(struct intel_display *display)
 {
        struct drm_i915_private *i915 = to_i915(display->drm);

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 188185ecd4c0affca2063ef188eda8a9049f0b1d..b18363c1d47218ae9b2e25365f1c9dfaa8ee5cc6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -569,8 +569,6 @@ enum drm_mode_status intel_mode_valid(struct drm_device *dev,
 int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
                        bool nonblock);
 
-void intel_hpd_poll_fini(struct drm_i915_private *i915);
-
 /* modesetting asserts */
 void assert_transcoder(struct intel_display *display,
                       enum transcoder cpu_transcoder, bool state);

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
index 9c935afc60aaf7de7fdaec31682fc8d83daa0817..00d7b1ccf190008b26f6a04d389708c3f1bb6909 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -28,8 +28,10 @@
 
 #include "i915_drv.h"
 #include "i915_irq.h"
+#include "intel_connector.h"
 #include "intel_display_power.h"
 #include "intel_display_types.h"
+#include "intel_hdcp.h"
 #include "intel_hotplug.h"
 #include "intel_hotplug_irq.h"
 
@@ -864,6 +866,20 @@ void intel_hpd_poll_disable(struct drm_i915_private *dev_priv)
        spin_unlock_irq(&dev_priv->irq_lock);
 }
 
+void intel_hpd_poll_fini(struct drm_i915_private *i915)
+{
+       struct intel_connector *connector;
+       struct drm_connector_list_iter conn_iter;
+
+       /* Kill all the work that may have been queued by hpd. */
+       drm_connector_list_iter_begin(&i915->drm, &conn_iter);
+       for_each_intel_connector_iter(connector, &conn_iter) {
+               intel_connector_cancel_modeset_retry_work(connector);
+               intel_hdcp_cancel_works(connector);
+       }
+       drm_connector_list_iter_end(&conn_iter);
+}
+
 void intel_hpd_init_early(struct drm_i915_private *i915)
 {
        INIT_DELAYED_WORK(&i915->display.hotplug.hotplug_work,

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.h b/drivers/gpu/drm/i915/display/intel_hotplug.h
index d2ca9d2f1d393c30b3fc18c0396638de0f688bc4..d6986902b054506f00f961f30ab0e2bca49e1623 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hotplug.h
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.h
@@ -16,6 +16,7 @@ enum port;
 
 void intel_hpd_poll_enable(struct drm_i915_private *dev_priv);
 void intel_hpd_poll_disable(struct drm_i915_private *dev_priv);
+void intel_hpd_poll_fini(struct drm_i915_private *i915);
 enum intel_hotplug_state intel_encoder_hotplug(struct intel_encoder *encoder,
                                               struct intel_connector *connector);
 void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,