From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755716AbcJZQub (ORCPT ); Wed, 26 Oct 2016 12:50:31 -0400 Received: from mga14.intel.com ([192.55.52.115]:56514 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754280AbcJZQua (ORCPT ); Wed, 26 Oct 2016 12:50:30 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,551,1473145200"; d="scan'208";a="1076134846" Date: Wed, 26 Oct 2016 19:50:25 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Lyude Cc: intel-gfx@lists.freedesktop.org, Jani Saarinen , Petry Latvala , Daniel Vetter , Jani Nikula , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/i915/vlv: Prevent enabling hpd polling in late suspend Message-ID: <20161026165025.GO4617@intel.com> References: <1477499769-1966-1-git-send-email-lyude@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1477499769-1966-1-git-send-email-lyude@redhat.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 26, 2016 at 12:36:09PM -0400, Lyude wrote: > 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: 19625e85c6ec ("drm/i915: Enable polling when we don't have hpd") > Signed-off-by: Lyude > Cc: Ville Syrjälä > Cc: Jani Saarinen > Cc: Petry Latvala > --- > drivers/gpu/drm/i915/intel_runtime_pm.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c > index 82edba2..ac85482 100644 > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > @@ -1138,7 +1138,9 @@ static void vlv_display_power_well_deinit(struct drm_i915_private *dev_priv) > > intel_power_sequencer_reset(dev_priv); > > - intel_hpd_poll_init(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); The flag would appear to get set between suspend and suspend_late, so looks like this should be sufficient for our purposes. Reviewed-by: Ville Syrjälä > } > > static void vlv_display_power_well_enable(struct drm_i915_private *dev_priv, > -- > 2.7.4 -- Ville Syrjälä Intel OTC