Re: [PATCH 05/12] drm/i915: Move intel_hpd_poll_fini() into intel_hotplug.c

[Jani Nikula <jani.nikula@linux.intel.com>]

On Thu, 13 Feb 2025, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> 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>

Side note, I've got patches convert all the hotplug and display irq code
over to struct intel_display. Let's get this merged first and I'll
rebase.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 16 ----------------
>  drivers/gpu/drm/i915/display/intel_display.h |  2 --
>  drivers/gpu/drm/i915/display/intel_hotplug.c | 16 ++++++++++++++++
>  drivers/gpu/drm/i915/display/intel_hotplug.h |  1 +
>  4 files changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index d3f8af9c75ef..0807a4979ea2 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -62,7 +62,6 @@
>  #include "intel_bw.h"
>  #include "intel_cdclk.h"
>  #include "intel_clock_gating.h"
> -#include "intel_connector.h"
>  #include "intel_color.h"
>  #include "intel_crt.h"
>  #include "intel_crtc.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"
> @@ -8781,20 +8779,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 d4a709588700..e14aa773323e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -571,8 +571,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 9c935afc60aa..00d7b1ccf190 100644
> --- 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 d2ca9d2f1d39..d6986902b054 100644
> --- 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,

-- 
Jani Nikula, Intel