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

Commit 3a2fb2c3 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Revert "drm/i915: Call encoder hotplug for init and resume cases" 



This reverts commit 5d250b05.

It results on a deadlock on platforms where we need to (at least
partially) re-init hpd interrupts from power domain code, since
->hot_plug might again grab a power well reference (to do edid/dp_aux
transactions. At least chv is affected.

Reported-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
References: http://mid.gmane.org/20151008133548.GX26517@intel.com


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 8166fcea

drivers/gpu/drm/i915/intel_hotplug.c

+0 −11
Original line number Diff line number Diff line
@@ -458,7 +458,6 @@ void intel_hpd_init(struct drm_i915_private *dev_priv) 
{

	struct drm_device *dev = dev_priv->dev;

	struct drm_mode_config *mode_config = &dev->mode_config;

	struct intel_encoder *encoder;

	struct drm_connector *connector;

	int i;
@@ -483,16 +482,6 @@ void intel_hpd_init(struct drm_i915_private *dev_priv) 
	if (dev_priv->display.hpd_irq_setup)

		dev_priv->display.hpd_irq_setup(dev);

	spin_unlock_irq(&dev_priv->irq_lock);



	/*

	 * Connected boot / resume scenarios can't generate new hot plug.

	 * So, probe it manually.

	 */

	list_for_each_entry(encoder, &dev->mode_config.encoder_list,

			    base.head) {

		if (encoder->hot_plug)

			encoder->hot_plug(encoder);

	}

}



void intel_hpd_init_work(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/intel_sdvo.c

+1 −0
Original line number Diff line number Diff line
@@ -2460,6 +2460,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) 
		 * Ensure that they get re-enabled when an interrupt happens.

		 */

		intel_encoder->hot_plug = intel_sdvo_enable_hotplug;

		intel_sdvo_enable_hotplug(intel_encoder);

	} else {

		intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;

	}