From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2] drm/i915: Fix init_clock_gating for resume Date: Mon, 20 Nov 2017 15:02:37 +0200 Message-ID: <20171120130237.GT10981@intel.com> References: <20171113145028.10362-1-ville.syrjala@linux.intel.com> <20171116160215.25715-1-ville.syrjala@linux.intel.com> <151084889037.26104.2066629297039200637@mail.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1E6B689C9C for ; Mon, 20 Nov 2017 13:02:41 +0000 (UTC) Content-Disposition: inline In-Reply-To: <151084889037.26104.2066629297039200637@mail.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBOb3YgMTYsIDIwMTcgYXQgMDQ6MTQ6NTBQTSArMDAwMCwgQ2hyaXMgV2lsc29uIHdy b3RlOgo+IFF1b3RpbmcgVmlsbGUgU3lyamFsYSAoMjAxNy0xMS0xNiAxNjowMjoxNSkKPiA+IEZy b206IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gPiAK PiA+IE1vdmluZyB0aGUgaW5pdF9jbG9ja19nYXRpbmcoKSBjYWxsIGZyb20gaW50ZWxfbW9kZXNl dF9pbml0X2h3KCkgdG8KPiA+IGludGVsX21vZGVzZXRfZ2VtX2luaXQoKSBoYWQgYW4gdW5pbnRl bmRlZCBlZmZlY3Qgb2Ygbm90IGFwcGx5aW5nCj4gPiBzb21lIHdvcmthcm91bmRzIG9uIHJlc3Vt ZS4gVGhpcywgZm9yIGV4YW1wbGUsIGNhdXNlIHNvbWUga2luZCBvZgo+ID4gY29ycnVwdGlvbiB0 byBhcHBlYXIgYXQgdGhlIHRvcCBvZiBteSBJVkIgVGhpbmtwYWQgWDEgQ2FyYm9uIExWRFMKPiA+ IHNjcmVlbiBhZnRlciBoaWJlcm5hdGlvbi4gRml4IHRoZSBwcm9ibGVtIGJ5IGV4cGxpY2l0bHkg Y2FsbGluZwo+ID4gaW5pdF9jbG9ja19nYXRpbmcoKSBmcm9tIHRoZSByZXN1bWUgcGF0aC4KPiA+ IAo+ID4gSSByZWFsbHkgaG9wZSB0aGlzIGRvZXNuJ3QgYnJlYWsgc29tZXRoaW5nIGVsc2UgYWdh aW4uIEF0IGxlYXN0Cj4gPiB0aGUgcHJvYmxlbXMgcmVwb3J0ZWQgYXQgaHR0cHM6Ly9idWdzLmZy ZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNTQ5Cj4gPiBkaWRuJ3QgbWFrZSBhIGNv bWViYWNrLCBldmVuIGFmdGVyIGEgaGliZXJuYXRlIGN5Y2xlLgo+ID4gCj4gPiB2MjogUmVvcmRl ciB0aGUgaW5pdF9jbG9ja19nYXRpbmcgdnMuIG1vZGVzZXRfaW5pdF9odyB0byBtYXRjaAo+ID4g ICAgIHRoZSBkaXNwbGF5IHJlc2V0IHBhdGggKFJvZHJpZ28pCj4gPiAKPiA+IENjOiBzdGFibGVA dmdlci5rZXJuZWwub3JnCj4gPiBDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u Y28udWs+Cj4gPiBDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgo+ID4g Rml4ZXM6IDZhYzQzMjcyNzY4YyAoImRybS9pOTE1OiBNb3ZlIGluaXRfY2xvY2tfZ2F0aW5nKCkg YmFjayB0byB3aGVyZSBpdCB3YXMiKQo+ID4gU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiA+IFJldmlld2VkLWJ5OiBSb2RyaWdv IFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+Cj4gPiAtLS0KPiA+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIHwgMSArCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9u KCspCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+ID4gaW5kZXggMzQyM2Q4NzMxMjNh Li5mYjU4NGI4MjFmYjMgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gPiBAQCAt MTcwOSw2ICsxNzA5LDcgQEAgc3RhdGljIGludCBpOTE1X2RybV9yZXN1bWUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKPiA+ICAgICAgICAgaTkxNV9nZW1fcmVzdW1lKGRldl9wcml2KTsKPiA+ICAK PiA+ICAgICAgICAgaW50ZWxfbW9kZXNldF9pbml0X2h3KGRldik7Cj4gPiArICAgICAgIGludGVs X2luaXRfY2xvY2tfZ2F0aW5nKGRldl9wcml2KTsKPiAKPiBUaGUgcmVwZXRpdGlvbiBvZiBHVCBz dHVmZiBoZXJlIHNob3VsZG4ndCBiZSBhIHByb2JsZW0sIHNpbmNlIHRoZXkKPiBzaG91bGQgbWF0 Y2ggdGhlIHZhbHVlcyBpbiB0aGUgcmVsb2FkZWQgY29udGV4dC4gKElmIG5vdCwgd2UgaGF2ZSBi aWdnZXIKPiBwcm9ibGVtcyEpIEFuZCB0aGUgYml0cyB0aGF0IGFyZW4ndCBpbiB0aGUgY29udGV4 dCBkbyBuZWVkIHRvIGJlCj4gcmVzdG9yZWQuCj4gCj4gUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgoKUHVzaGVkIHRvIGRpbnEuIFRoYW5rcyBmb3Ig dGhlIHJldmlld3MuCgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com ([192.55.52.43]:64622 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751106AbdKTNCm (ORCPT ); Mon, 20 Nov 2017 08:02:42 -0500 Date: Mon, 20 Nov 2017 15:02:37 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Rodrigo Vivi Subject: Re: [PATCH v2] drm/i915: Fix init_clock_gating for resume Message-ID: <20171120130237.GT10981@intel.com> References: <20171113145028.10362-1-ville.syrjala@linux.intel.com> <20171116160215.25715-1-ville.syrjala@linux.intel.com> <151084889037.26104.2066629297039200637@mail.alporthouse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <151084889037.26104.2066629297039200637@mail.alporthouse.com> Sender: stable-owner@vger.kernel.org List-ID: On Thu, Nov 16, 2017 at 04:14:50PM +0000, Chris Wilson wrote: > Quoting Ville Syrjala (2017-11-16 16:02:15) > > From: Ville Syrj�l� > > > > Moving the init_clock_gating() call from intel_modeset_init_hw() to > > intel_modeset_gem_init() had an unintended effect of not applying > > some workarounds on resume. This, for example, cause some kind of > > corruption to appear at the top of my IVB Thinkpad X1 Carbon LVDS > > screen after hibernation. Fix the problem by explicitly calling > > init_clock_gating() from the resume path. > > > > I really hope this doesn't break something else again. At least > > the problems reported at https://bugs.freedesktop.org/show_bug.cgi?id=103549 > > didn't make a comeback, even after a hibernate cycle. > > > > v2: Reorder the init_clock_gating vs. modeset_init_hw to match > > the display reset path (Rodrigo) > > > > Cc: stable@vger.kernel.org > > Cc: Chris Wilson > > Cc: Rodrigo Vivi > > Fixes: 6ac43272768c ("drm/i915: Move init_clock_gating() back to where it was") > > Signed-off-by: Ville Syrj�l� > > Reviewed-by: Rodrigo Vivi > > --- > > drivers/gpu/drm/i915/i915_drv.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > > index 3423d873123a..fb584b821fb3 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.c > > +++ b/drivers/gpu/drm/i915/i915_drv.c > > @@ -1709,6 +1709,7 @@ static int i915_drm_resume(struct drm_device *dev) > > i915_gem_resume(dev_priv); > > > > intel_modeset_init_hw(dev); > > + intel_init_clock_gating(dev_priv); > > The repetition of GT stuff here shouldn't be a problem, since they > should match the values in the reloaded context. (If not, we have bigger > problems!) And the bits that aren't in the context do need to be > restored. > > Reviewed-by: Chris Wilson Pushed to dinq. Thanks for the reviews. -- Ville Syrj�l� Intel OTC