Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 821450c6 authored by Egbert Eich's avatar Egbert Eich Committed by Daniel Vetter
Browse files

drm/i915: (re)init HPD interrupt storm statistics 



When an encoder is shared on several connectors there is only
one hotplug line, thus this line needs to be shared among these
connectors.
If HPD detect only works reliably on a subset of those connectors,
we want to poll the others. Thus we need to make sure that storm
detection doesn't mess up the settings for those connectors.
Therefore we store the settings in the intel_connector struct and
restore them from there.
If nothing is set but the encoder has a hpd_pin set we assume this
connector is hotplug capable.
On init/reset we make sure the polled state of the connectors
is (re)set to the default value, the HPD interrupts are marked
enabled.

Signed-off-by: default avatarEgbert Eich <eich@suse.de>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b543fb04

drivers/gpu/drm/i915/i915_irq.c

+14 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ static inline void hotplug_irq_storm_detect(struct drm_device *dev, 
	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);



	for (i = 1; i < HPD_NUM_PINS; i++) {



		if (!(hpd[i] & hotplug_trigger) ||

		    dev_priv->hpd_stats[i].hpd_mark != HPD_ENABLED)

			continue;
@@ -3062,7 +3063,20 @@ void intel_irq_init(struct drm_device *dev) 
void intel_hpd_init(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_mode_config *mode_config = &dev->mode_config;

	struct drm_connector *connector;

	int i;



	for (i = 1; i < HPD_NUM_PINS; i++) {

		dev_priv->hpd_stats[i].hpd_cnt = 0;

		dev_priv->hpd_stats[i].hpd_mark = HPD_ENABLED;

	}

	list_for_each_entry(connector, &mode_config->connector_list, head) {

		struct intel_connector *intel_connector = to_intel_connector(connector);

		connector->polled = intel_connector->polled;

		if (!connector->polled && I915_HAS_HOTPLUG(dev) && intel_connector->encoder->hpd_pin > HPD_NONE)

			connector->polled = DRM_CONNECTOR_POLL_HPD;

	}

	if (dev_priv->display.hpd_irq_setup)

		dev_priv->display.hpd_irq_setup(dev);

}

drivers/gpu/drm/i915/intel_crt.c

+2 −4
Original line number Diff line number Diff line
@@ -793,10 +793,8 @@ void intel_crt_init(struct drm_device *dev) 


	drm_sysfs_connector_add(connector);



	if (I915_HAS_HOTPLUG(dev))

		connector->polled = DRM_CONNECTOR_POLL_HPD;

	else

		connector->polled = DRM_CONNECTOR_POLL_CONNECT;

	if (!I915_HAS_HOTPLUG(dev))

		intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT;



	/*

	 * Configure the automatic hotplug detection stuff

drivers/gpu/drm/i915/intel_dp.c

+0 −1
Original line number Diff line number Diff line
@@ -2787,7 +2787,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
	drm_connector_init(dev, connector, &intel_dp_connector_funcs, type);

	drm_connector_helper_add(connector, &intel_dp_connector_helper_funcs);



	connector->polled = DRM_CONNECTOR_POLL_HPD;

	connector->interlace_allowed = true;

	connector->doublescan_allowed = 0;

drivers/gpu/drm/i915/intel_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ struct intel_connector { 


	/* Cached EDID for eDP and LVDS. May hold ERR_PTR for invalid EDID. */

	struct edid *edid;



	/* since POLL and HPD connectors may use the same HPD line keep the native

	   state of connector->polled in case hotplug storm detection changes it */

	u8 polled;

};



struct intel_crtc_config {

drivers/gpu/drm/i915/intel_hdmi.c

+0 −1
Original line number Diff line number Diff line
@@ -998,7 +998,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, 
			   DRM_MODE_CONNECTOR_HDMIA);

	drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs);



	connector->polled = DRM_CONNECTOR_POLL_HPD;

	connector->interlace_allowed = 1;

	connector->doublescan_allowed = 0;