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

Commit 1ff74cf1 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915: drop encoder hot_plug calls at resume 



We really just want to go detect displays again and fire off a hotplug
event if things have changed, not go through full hotplug processing.

Requested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bc76e320

drivers/gpu/drm/i915/i915_drv.c

+1 −19
Original line number Diff line number Diff line
@@ -597,24 +597,6 @@ void intel_console_resume(struct work_struct *work) 
	console_unlock();

}



static void intel_resume_hotplug(struct drm_device *dev)

{

	struct drm_mode_config *mode_config = &dev->mode_config;

	struct intel_encoder *encoder;



	mutex_lock(&mode_config->mutex);

	DRM_DEBUG_KMS("running encoder hotplug functions\n");



	list_for_each_entry(encoder, &mode_config->encoder_list, base.head)

		if (encoder->hot_plug)

			encoder->hot_plug(encoder);



	mutex_unlock(&mode_config->mutex);



	/* Just fire off a uevent and let userspace tell us what to do */

	drm_helper_hpd_irq_event(dev);

}



static int i915_drm_thaw_early(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -670,7 +652,7 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) 
		intel_hpd_init(dev);

		dev_priv->enable_hotplug_processing = true;

		/* Config may have changed between suspend and resume */

		intel_resume_hotplug(dev);

		drm_helper_hpd_irq_event(dev);

	}



	intel_opregion_init(dev);