Commit dd890d42 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/hotplug: refactor hotplug init slightly 



Rename intel_hpd_init_work() to the more generic intel_hpd_init_early(),
and move the hotplug storm initialization there. This lets us move the
HPD_STORM_DEFAULT_THRESHOLD macro to intel_hotplug.c too.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220916130634.3781122-2-jani.nikula@intel.com
parent 1bed8b07

drivers/gpu/drm/i915/display/intel_hotplug.c

+17 −5
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv, 
	return HPD_PORT_A + port - PORT_A;

}



/* Threshold == 5 for long IRQs, 50 for short */

#define HPD_STORM_DEFAULT_THRESHOLD	50



#define HPD_STORM_DETECT_PERIOD		1000

#define HPD_STORM_REENABLE_DELAY	(2 * 60 * 1000)

#define HPD_RETRY_DELAY			1000
@@ -711,14 +714,23 @@ void intel_hpd_poll_disable(struct drm_i915_private *dev_priv) 
	schedule_work(&dev_priv->display.hotplug.poll_init_work);

}



void intel_hpd_init_work(struct drm_i915_private *dev_priv)

void intel_hpd_init_early(struct drm_i915_private *i915)

{

	INIT_DELAYED_WORK(&dev_priv->display.hotplug.hotplug_work,

	INIT_DELAYED_WORK(&i915->display.hotplug.hotplug_work,

			  i915_hotplug_work_func);

	INIT_WORK(&dev_priv->display.hotplug.dig_port_work, i915_digport_work_func);

	INIT_WORK(&dev_priv->display.hotplug.poll_init_work, i915_hpd_poll_init_work);

	INIT_DELAYED_WORK(&dev_priv->display.hotplug.reenable_work,

	INIT_WORK(&i915->display.hotplug.dig_port_work, i915_digport_work_func);

	INIT_WORK(&i915->display.hotplug.poll_init_work, i915_hpd_poll_init_work);

	INIT_DELAYED_WORK(&i915->display.hotplug.reenable_work,

			  intel_hpd_irq_storm_reenable_work);



	i915->display.hotplug.hpd_storm_threshold = HPD_STORM_DEFAULT_THRESHOLD;

	/* If we have MST support, we want to avoid doing short HPD IRQ storm

	 * detection, as short HPD storms will occur as a natural part of

	 * sideband messaging with MST.

	 * On older platforms however, IRQ storms can occur with both long and

	 * short pulses, as seen on some G4x systems.

	 */

	i915->display.hotplug.hpd_short_storm_enabled = !HAS_DP_MST(i915);

}



void intel_hpd_cancel_work(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/display/intel_hotplug.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv, 
			   u32 pin_mask, u32 long_mask);

void intel_hpd_trigger_irq(struct intel_digital_port *dig_port);

void intel_hpd_init(struct drm_i915_private *dev_priv);

void intel_hpd_init_work(struct drm_i915_private *dev_priv);

void intel_hpd_init_early(struct drm_i915_private *i915);

void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);

enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,

				   enum port port);

drivers/gpu/drm/i915/i915_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ struct intel_limit; 
struct intel_overlay_error_state;

struct vlv_s0ix_state;



/* Threshold == 5 for long IRQs, 50 for short */

#define HPD_STORM_DEFAULT_THRESHOLD 50



#define I915_GEM_GPU_DOMAINS \

	(I915_GEM_DOMAIN_RENDER | \

	 I915_GEM_DOMAIN_SAMPLER | \

drivers/gpu/drm/i915/i915_irq.c

+1 −10
Original line number Diff line number Diff line
@@ -4399,7 +4399,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv) 


	intel_hpd_init_pins(dev_priv);



	intel_hpd_init_work(dev_priv);

	intel_hpd_init_early(dev_priv);



	dev->vblank_disable_immediate = true;
@@ -4413,15 +4413,6 @@ void intel_irq_init(struct drm_i915_private *dev_priv) 
	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		dev_priv->display_irqs_enabled = false;



	dev_priv->display.hotplug.hpd_storm_threshold = HPD_STORM_DEFAULT_THRESHOLD;

	/* If we have MST support, we want to avoid doing short HPD IRQ storm

	 * detection, as short HPD storms will occur as a natural part of

	 * sideband messaging with MST.

	 * On older platforms however, IRQ storms can occur with both long and

	 * short pulses, as seen on some G4x systems.

	 */

	dev_priv->display.hotplug.hpd_short_storm_enabled = !HAS_DP_MST(dev_priv);



	if (HAS_GMCH(dev_priv)) {

		if (I915_HAS_HOTPLUG(dev_priv))

			dev_priv->display.funcs.hotplug = &i915_hpd_funcs;