On Tue, May 20, 2014 at 03:25:33PM -0700, Jesse Barnes wrote:
> 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: Daniel Vetter <daniel.vet...@ffwll.ch>
> Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
Yeah, still can't remember why we've done this, and the commit message is
silent.
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_drv.c | 20 +-------------------
> 1 file changed, 1 insertion(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index b948c71..302495f 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -551,24 +551,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;
> @@ -624,7 +606,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);
> --
> 1.8.4.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
