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

Commit b64b5409 authored by Lyude's avatar Lyude Committed by Jani Nikula
Browse files

drm/i915/vlv: Prevent enabling hpd polling in late suspend 

One of the CI machines began to run into issues with the hpd poller
suddenly waking up in the midst of the late suspend phase. It looks like
this is getting caused by the fact we now deinitialize power wells in
late suspend, which means that intel_hpd_poll_init() gets called in late
suspend causing polling to get re-enabled. So, when deinitializing power
wells on valleyview we now refrain from enabling polling in the midst of
suspend.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98040


Fixes: 19625e85 ("drm/i915: Enable polling when we don't have hpd")
Signed-off-by: default avatarLyude <lyude@redhat.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Saarinen <jani.saarinen@intel.com>
Cc: Petry Latvala <petri.latvala@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477499769-1966-1-git-send-email-lyude@redhat.com
parent 80b204bc

drivers/gpu/drm/i915/intel_runtime_pm.c

+3 −1
Original line number Diff line number Diff line
@@ -1113,6 +1113,8 @@ static void vlv_display_power_well_deinit(struct drm_i915_private *dev_priv) 


	intel_power_sequencer_reset(dev_priv);



	/* Prevent us from re-enabling polling on accident in late suspend */

	if (!dev_priv->drm.dev->power.is_suspended)

		intel_hpd_poll_init(dev_priv);

}