From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915/vlv: Prevent enabling hpd polling in late suspend Date: Sat, 29 Oct 2016 15:14:31 +0300 Message-ID: <87lgx7mjx4.fsf@intel.com> References: <1477499769-1966-1-git-send-email-lyude@redhat.com> <20161026165025.GO4617@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161026165025.GO4617@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ville =?utf-8?B?U3lyasOkbMOk?= , Lyude Cc: Petry Latvala , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Jani Saarinen List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAyNiBPY3QgMjAxNiwgVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4gd3JvdGU6Cj4gT24gV2VkLCBPY3QgMjYsIDIwMTYgYXQgMTI6MzY6MDlQTSAt MDQwMCwgTHl1ZGUgd3JvdGU6Cj4+IE9uZSBvZiB0aGUgQ0kgbWFjaGluZXMgYmVnYW4gdG8gcnVu IGludG8gaXNzdWVzIHdpdGggdGhlIGhwZCBwb2xsZXIKPj4gc3VkZGVubHkgd2FraW5nIHVwIGlu IHRoZSBtaWRzdCBvZiB0aGUgbGF0ZSBzdXNwZW5kIHBoYXNlLiBJdCBsb29rcyBsaWtlCj4+IHRo aXMgaXMgZ2V0dGluZyBjYXVzZWQgYnkgdGhlIGZhY3Qgd2Ugbm93IGRlaW5pdGlhbGl6ZSBwb3dl ciB3ZWxscyBpbgo+PiBsYXRlIHN1c3BlbmQsIHdoaWNoIG1lYW5zIHRoYXQgaW50ZWxfaHBkX3Bv bGxfaW5pdCgpIGdldHMgY2FsbGVkIGluIGxhdGUKPj4gc3VzcGVuZCBjYXVzaW5nIHBvbGxpbmcg dG8gZ2V0IHJlLWVuYWJsZWQuIFNvLCB3aGVuIGRlaW5pdGlhbGl6aW5nIHBvd2VyCj4+IHdlbGxz IG9uIHZhbGxleXZpZXcgd2Ugbm93IHJlZnJhaW4gZnJvbSBlbmFibGluZyBwb2xsaW5nIGluIHRo ZSBtaWRzdCBvZgo+PiBzdXNwZW5kLgo+PiAKPj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVl ZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MDQwCj4+IEZpeGVzOiAxOTYyNWU4NWM2ZWMg KCJkcm0vaTkxNTogRW5hYmxlIHBvbGxpbmcgd2hlbiB3ZSBkb24ndCBoYXZlIGhwZCIpCj4+IFNp Z25lZC1vZmYtYnk6IEx5dWRlIDxseXVkZUByZWRoYXQuY29tPgo+PiBDYzogVmlsbGUgU3lyasOk bMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPj4gQ2M6IEphbmkgU2FhcmluZW4g PGphbmkuc2FhcmluZW5AaW50ZWwuY29tPgo+PiBDYzogUGV0cnkgTGF0dmFsYSA8cGV0cmkubGF0 dmFsYUBpbnRlbC5jb20+Cj4+IC0tLQo+PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVu dGltZV9wbS5jIHwgNCArKystCj4+ICAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAx IGRlbGV0aW9uKC0pCj4+IAo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5j Cj4+IGluZGV4IDgyZWRiYTIuLmFjODU0ODIgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ydW50aW1lX3BtLmMKPj4gQEAgLTExMzgsNyArMTEzOCw5IEBAIHN0YXRpYyB2b2lkIHZs dl9kaXNwbGF5X3Bvd2VyX3dlbGxfZGVpbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKPj4gIAo+PiAgCWludGVsX3Bvd2VyX3NlcXVlbmNlcl9yZXNldChkZXZfcHJpdik7Cj4+ ICAKPj4gLQlpbnRlbF9ocGRfcG9sbF9pbml0KGRldl9wcml2KTsKPj4gKwkvKiBQcmV2ZW50IHVz IGZyb20gcmUtZW5hYmxpbmcgcG9sbGluZyBvbiBhY2NpZGVudCBpbiBsYXRlIHN1c3BlbmQgKi8K Pj4gKwlpZiAoIWRldl9wcml2LT5kcm0uZGV2LT5wb3dlci5pc19zdXNwZW5kZWQpCj4+ICsJCWlu dGVsX2hwZF9wb2xsX2luaXQoZGV2X3ByaXYpOwo+Cj4gVGhlIGZsYWcgd291bGQgYXBwZWFyIHRv IGdldCBzZXQgYmV0d2VlbiBzdXNwZW5kIGFuZCBzdXNwZW5kX2xhdGUsIHNvCj4gbG9va3MgbGlr ZSB0aGlzIHNob3VsZCBiZSBzdWZmaWNpZW50IGZvciBvdXIgcHVycG9zZXMuCj4KPiBSZXZpZXdl ZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClB1 c2hlZCB0byBkcm0taW50ZWwtbmV4dC1xdWV1ZWQsIHRoYW5rcyBmb3IgdGhlIHBhdGNoIGFuZCBy ZXZpZXcuCgpCUiwKSmFuaS4KCj4KPj4gIH0KPj4gIAo+PiAgc3RhdGljIHZvaWQgdmx2X2Rpc3Bs YXlfcG93ZXJfd2VsbF9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ PiAtLSAKPj4gMi43LjQKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5v bG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755852AbcJ2MOj convert rfc822-to-8bit (ORCPT ); Sat, 29 Oct 2016 08:14:39 -0400 Received: from mga06.intel.com ([134.134.136.31]:10884 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754934AbcJ2MOi (ORCPT ); Sat, 29 Oct 2016 08:14:38 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,563,1473145200"; d="scan'208";a="779478104" From: Jani Nikula To: Ville =?utf-8?B?U3lyasOkbMOk?= , Lyude Cc: intel-gfx@lists.freedesktop.org, Jani Saarinen , Petry Latvala , Daniel Vetter , 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 In-Reply-To: <20161026165025.GO4617@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1477499769-1966-1-git-send-email-lyude@redhat.com> <20161026165025.GO4617@intel.com> Date: Sat, 29 Oct 2016 15:14:31 +0300 Message-ID: <87lgx7mjx4.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 26 Oct 2016, Ville Syrjälä wrote: > 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ä Pushed to drm-intel-next-queued, thanks for the patch and review. BR, Jani. > >> } >> >> static void vlv_display_power_well_enable(struct drm_i915_private *dev_priv, >> -- >> 2.7.4 -- Jani Nikula, Intel Open Source Technology Center