From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 2/4] drm/i915: Don't init hpd polling for vlv and chv from runtime_suspend() Date: Fri, 20 Jan 2017 16:58:52 +0200 Message-ID: <20170120145852.GE31595@intel.com> References: <1484922525-6131-1-git-send-email-ander.conselvan.de.oliveira@intel.com> <1484922525-6131-2-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E38A16EBBE for ; Fri, 20 Jan 2017 14:58:56 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1484922525-6131-2-git-send-email-ander.conselvan.de.oliveira@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ander Conselvan de Oliveira Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCBKYW4gMjAsIDIwMTcgYXQgMDQ6Mjg6NDNQTSArMDIwMCwgQW5kZXIgQ29uc2VsdmFu IGRlIE9saXZlaXJhIHdyb3RlOgo+IEFuIGVycm9yIGluIHRoZSBjb25kaXRpb24gZm9yIGF2b2lk aW5nIHRoZSBjYWxsIHRvIGludGVsX2hwZF9wb2xsX2luaXQoKQo+IGZvciB2YWxsZXl2aWV3IGFu ZCBjaGVycnl2aWV3IGZyb20gaW50ZWxfcnVudGltZV9zdXNwZW5kKCkgY2F1c2VkIGl0IHRvCj4g YmUgY2FsbGVkIHVuY29uZGl0aW9uYWxseS4gRml4IGl0Lgo+IAo+IEZvdW5kIGJ5IGNvdmVyaXR5 Lgo+IAo+IEZpeGVzOiAxOTYyNWU4NWM2ZWMgKCJkcm0vaTkxNTogRW5hYmxlIHBvbGxpbmcgd2hl biB3ZSBkb24ndCBoYXZlIGhwZCIpCj4gQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPiBDYzog VmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiBDYzogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPiBDYzogTHl1ZGUgPGNwYXVsQHJl ZGhhdC5jb20+Cj4gQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgo+ IENjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgo+IENjOiBpbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3Jn PiAjIHY0LjkrCj4gU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxh bmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgoKUmV2aWV3ZWQtYnk6IFZpbGxl IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cgo+IC0tLQo+ICBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgMiArLQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBp bnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiBp bmRleCA0YWU2OWViLi5jYTE2OGIyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gQEAg LTIzNzcsNyArMjM3Nyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfcnVudGltZV9zdXNwZW5kKHN0cnVj dCBkZXZpY2UgKmtkZXYpCj4gIAo+ICAJYXNzZXJ0X2ZvcmNld2FrZXNfaW5hY3RpdmUoZGV2X3By aXYpOwo+ICAKPiAtCWlmICghSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgIUlTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKQo+ICsJaWYgKCFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJiAhSVNfQ0hF UlJZVklFVyhkZXZfcHJpdikpCj4gIAkJaW50ZWxfaHBkX3BvbGxfaW5pdChkZXZfcHJpdik7Cj4g IAo+ICAJRFJNX0RFQlVHX0tNUygiRGV2aWNlIHN1c3BlbmRlZFxuIik7Cj4gLS0gCj4gMi41LjUK Ci0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com ([134.134.136.24]:19523 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752659AbdATO7C (ORCPT ); Fri, 20 Jan 2017 09:59:02 -0500 Date: Fri, 20 Jan 2017 16:58:52 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Ander Conselvan de Oliveira Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Daniel Vetter , Lyude , Daniel Vetter , Jani Nikula Subject: Re: [PATCH 2/4] drm/i915: Don't init hpd polling for vlv and chv from runtime_suspend() Message-ID: <20170120145852.GE31595@intel.com> References: <1484922525-6131-1-git-send-email-ander.conselvan.de.oliveira@intel.com> <1484922525-6131-2-git-send-email-ander.conselvan.de.oliveira@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1484922525-6131-2-git-send-email-ander.conselvan.de.oliveira@intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Fri, Jan 20, 2017 at 04:28:43PM +0200, Ander Conselvan de Oliveira wrote: > An error in the condition for avoiding the call to intel_hpd_poll_init() > for valleyview and cherryview from intel_runtime_suspend() caused it to > be called unconditionally. Fix it. > > Found by coverity. > > Fixes: 19625e85c6ec ("drm/i915: Enable polling when we don't have hpd") > Cc: stable@vger.kernel.org > Cc: Ville Syrj�l� > Cc: Daniel Vetter > Cc: Lyude > Cc: Daniel Vetter > Cc: Jani Nikula > Cc: intel-gfx@lists.freedesktop.org > Cc: # v4.9+ > Signed-off-by: Ander Conselvan de Oliveira Reviewed-by: Ville Syrj�l� > --- > drivers/gpu/drm/i915/i915_drv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 4ae69eb..ca168b2 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -2377,7 +2377,7 @@ static int intel_runtime_suspend(struct device *kdev) > > assert_forcewakes_inactive(dev_priv); > > - if (!IS_VALLEYVIEW(dev_priv) || !IS_CHERRYVIEW(dev_priv)) > + if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv)) > intel_hpd_poll_init(dev_priv); > > DRM_DEBUG_KMS("Device suspended\n"); > -- > 2.5.5 -- Ville Syrj�l� Intel OTC