From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 1/7] drm/i915: Fix deadlock witha the pipe A quirk during resume Date: Fri, 02 Jun 2017 10:04:33 +0300 Message-ID: <87h8zy98fy.fsf@intel.com> References: <20170601143619.27840-1-ville.syrjala@linux.intel.com> <20170601143619.27840-2-ville.syrjala@linux.intel.com> <87o9u7hii6.fsf@intel.com> <20170601160107.GP12629@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 642836E51D for ; Fri, 2 Jun 2017 07:04:43 +0000 (UTC) In-Reply-To: <20170601160107.GP12629@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ville =?utf-8?B?U3lyasOkbMOk?= Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAwMSBKdW4gMjAxNywgVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4gd3JvdGU6Cj4gT24gVGh1LCBKdW4gMDEsIDIwMTcgYXQgMDU6NDc6NDVQTSAr MDMwMCwgSmFuaSBOaWt1bGEgd3JvdGU6Cj4+IE9uIFRodSwgMDEgSnVuIDIwMTcsIHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tIHdyb3RlOgo+PiA+IEZyb206IFZpbGxlIFN5cmrDpGzDpCA8 dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4+ID4KPj4gPiBQYXNzIGRvd24gdGhlIGNv cnJlY3QgYWNxdWlyZSBjb250ZXh0IHRvIHRoZSBwaXBlIEEgcXVpcmsgbG9hZCBkZXRlY3QKPj4g PiBoYWNrIGR1cmluZyBkaXNwbGF5IHJlc3VtZS4gQXZvaWRzIGRlYWRsb2NraW5nIHRoZSBlbnRp cmUgdGhpbmcuCj4+IAo+PiBIYXZlIHdlIHNlZW4gdGhpcyBpbiB0aGUgd2lsZD8gUmVmZXJlbmNl cz8KPgo+IE15IDgzMC4KCk9rYXksIGp1c3QgY2hlY2tpbmcgaWYgdGhlIGNjOiBzdGFibGUgd2Fz IHJlYWxseSB3YXJyYW50ZWQgaW4gdGhpcyBvbmUKYW5kIHRoZSBuZXh0IHBhdGNoLiBDYXJyeSBv biEgOikKCkJSLApKYW5pLgoKPgo+PiAKPj4gQlIsCj4+IEphbmkuCj4+IAo+PiA+Cj4+ID4gQ2M6 IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPj4gPiBDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0 ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPj4gPiBGaXhlczogZTJjOGI4NzAxZTJkICgi ZHJtL2k5MTU6IFVzZSBhdG9taWMgaGVscGVycyBmb3Igc3VzcGVuZCwgdjIuIikKPj4gPiBTaWdu ZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29t Pgo+PiA+IC0tLQo+PiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAy MSArKysrKysrKysrKystLS0tLS0tLS0KPj4gPiAgMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlv bnMoKyksIDkgZGVsZXRpb25zKC0pCj4+ID4KPj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCj4+ID4gaW5kZXggZWQ0MWI1OWVlOGUzLi4yZjc2YTYzZWZlOGMgMTAwNjQ0Cj4+ID4g LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+ID4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+ID4gQEAgLTEyMCw3ICsxMjAsOCBA QCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2luaXRfc2NhbGVycyhzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YywKPj4gPiAgc3RhdGljIHZvaWQgc2t5bGFrZV9wZml0X2VuYWJsZShzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0Yyk7Cj4+ID4gIHN0YXRpYyB2b2lkIGlyb25sYWtlX3BmaXRfZGlzYWJsZShzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywgYm9vbCBmb3JjZSk7Cj4+ID4gIHN0YXRpYyB2b2lkIGlyb25s YWtlX3BmaXRfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKPj4gPiAtc3RhdGljIHZv aWQgaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK Pj4gPiArc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAo+PiA+ICsJCQkJCSBzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHgg KmN0eCk7Cj4+ID4gIHN0YXRpYyB2b2lkIGludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnlfbm9hdG9t aWMoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKPj4gPiAgCj4+ID4gIHN0cnVjdCBpbnRlbF9saW1p dCB7Cj4+ID4gQEAgLTM0NjEsNyArMzQ2Miw3IEBAIF9faW50ZWxfZGlzcGxheV9yZXN1bWUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKPj4gPiAgCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKPj4gPiAg CWludCBpLCByZXQ7Cj4+ID4gIAo+PiA+IC0JaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShk ZXYpOwo+PiA+ICsJaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShkZXYsIGN0eCk7Cj4+ID4g IAlpOTE1X3JlZGlzYWJsZV92Z2EodG9faTkxNShkZXYpKTsKPj4gPiAgCj4+ID4gIAlpZiAoIXN0 YXRlKQo+PiA+IEBAIC0xNTA5NCw3ICsxNTA5NSw3IEBAIGludCBpbnRlbF9tb2Rlc2V0X2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKPj4gPiAgCWludGVsX3NldHVwX291dHB1dHMoZGV2X3By aXYpOwo+PiA+ICAKPj4gPiAgCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7Cj4+ID4gLQlpbnRl bF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKGRldik7Cj4+ID4gKwlpbnRlbF9tb2Rlc2V0X3NldHVw X2h3X3N0YXRlKGRldiwgZGV2LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eCk7Cj4+ID4gIAlkcm1f bW9kZXNldF91bmxvY2tfYWxsKGRldik7Cj4+ID4gIAo+PiA+ICAJZm9yX2VhY2hfaW50ZWxfY3J0 YyhkZXYsIGNydGMpIHsKPj4gPiBAQCAtMTUxMzEsMTMgKzE1MTMyLDEzIEBAIGludCBpbnRlbF9t b2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPj4gPiAgCXJldHVybiAwOwo+PiA+ ICB9Cj4+ID4gIAo+PiA+IC1zdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfcGlwZV9hKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCj4+ID4gK3N0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9waXBlX2Eoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKPj4gPiArCQkJCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJl X2N0eCAqY3R4KQo+PiA+ICB7Cj4+ID4gIAlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0 b3I7Cj4+ID4gIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXIgY29ubl9pdGVyOwo+PiA+ ICAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNydCA9IE5VTEw7Cj4+ID4gIAlzdHJ1Y3QgaW50ZWxf bG9hZF9kZXRlY3RfcGlwZSBsb2FkX2RldGVjdF90ZW1wOwo+PiA+IC0Jc3RydWN0IGRybV9tb2Rl c2V0X2FjcXVpcmVfY3R4ICpjdHggPSBkZXYtPm1vZGVfY29uZmlnLmFjcXVpcmVfY3R4Owo+PiA+ ICAJaW50IHJldDsKPj4gPiAgCj4+ID4gIAkvKiBXZSBjYW4ndCBqdXN0IHN3aXRjaCBvbiB0aGUg cGlwZSBBLCB3ZSBuZWVkIHRvIHNldCB0aGluZ3MgdXAgd2l0aCBhCj4+ID4gQEAgLTE1MjA5LDcg KzE1MjEwLDggQEAgc3RhdGljIGJvb2wgaGFzX3BjaF90cmFuY29kZXIoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAo+PiA+ICAJCShIQVNfUENIX0xQVF9IKGRldl9wcml2KSAmJiBw Y2hfdHJhbnNjb2RlciA9PSBUUkFOU0NPREVSX0EpOwo+PiA+ICB9Cj4+ID4gIAo+PiA+IC1zdGF0 aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+PiA+ ICtzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj LAo+PiA+ICsJCQkJc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4ICpjdHgpCj4+ID4gIHsK Pj4gPiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKPj4gPiAgCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKPj4gPiBAQCAt MTUyNjUsNyArMTUyNjcsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKQo+PiA+ICAJCSAqIHJlc3VtZS4gRm9yY2UtZW5hYmxlIHRoZSBw aXBlIHRvIGZpeCB0aGlzLCB0aGUgdXBkYXRlX2RwbXMKPj4gPiAgCQkgKiBjYWxsIGJlbG93IHdl IHJlc3RvcmUgdGhlIHBpcGUgdG8gdGhlIHJpZ2h0IHN0YXRlLCBidXQgbGVhdmUKPj4gPiAgCQkg KiB0aGUgcmVxdWlyZWQgYml0cyBvbi4gKi8KPj4gPiAtCQlpbnRlbF9lbmFibGVfcGlwZV9hKGRl dik7Cj4+ID4gKwkJaW50ZWxfZW5hYmxlX3BpcGVfYShkZXYsIGN0eCk7Cj4+ID4gIAl9Cj4+ID4g IAo+PiA+ICAJLyogQWRqdXN0IHRoZSBzdGF0ZSBvZiB0aGUgb3V0cHV0IHBpcGUgYWNjb3JkaW5n IHRvIHdoZXRoZXIgd2UKPj4gPiBAQCAtMTU1NjgsNyArMTU1NzAsOCBAQCBnZXRfZW5jb2Rlcl9w b3dlcl9kb21haW5zKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPj4gPiAgICog YW5kIHNhbml0aXplcyBpdCB0byB0aGUgY3VycmVudCBzdGF0ZQo+PiA+ICAgKi8KPj4gPiAgc3Rh dGljIHZvaWQKPj4gPiAtaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQo+PiA+ICtpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCj4+ID4gKwkJCSAgICAgc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4 ICpjdHgpCj4+ID4gIHsKPj4gPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKPj4gPiAgCWVudW0gcGlwZSBwaXBlOwo+PiA+IEBAIC0xNTU4OCw3ICsx NTU5MSw3IEBAIGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKPj4gPiAgCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpIHsKPj4gPiAgCQljcnRj ID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BpcGUoZGV2X3ByaXYsIHBpcGUpOwo+PiA+ICAKPj4gPiAt CQlpbnRlbF9zYW5pdGl6ZV9jcnRjKGNydGMpOwo+PiA+ICsJCWludGVsX3Nhbml0aXplX2NydGMo Y3J0YywgY3R4KTsKPj4gPiAgCQlpbnRlbF9kdW1wX3BpcGVfY29uZmlnKGNydGMsIGNydGMtPmNv bmZpZywKPj4gPiAgCQkJCSAgICAgICAiW3NldHVwX2h3X3N0YXRlXSIpOwo+PiA+ICAJfQo+PiAK Pj4gLS0gCj4+IEphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRl cgoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com ([134.134.136.100]:24615 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148AbdFBHEs (ORCPT ); Fri, 2 Jun 2017 03:04:48 -0400 From: Jani Nikula To: Ville =?utf-8?B?U3lyasOkbMOk?= Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH 1/7] drm/i915: Fix deadlock witha the pipe A quirk during resume In-Reply-To: <20170601160107.GP12629@intel.com> References: <20170601143619.27840-1-ville.syrjala@linux.intel.com> <20170601143619.27840-2-ville.syrjala@linux.intel.com> <87o9u7hii6.fsf@intel.com> <20170601160107.GP12629@intel.com> Date: Fri, 02 Jun 2017 10:04:33 +0300 Message-ID: <87h8zy98fy.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: On Thu, 01 Jun 2017, Ville Syrjälä wrote: > On Thu, Jun 01, 2017 at 05:47:45PM +0300, Jani Nikula wrote: >> On Thu, 01 Jun 2017, ville.syrjala@linux.intel.com wrote: >> > From: Ville Syrjälä >> > >> > Pass down the correct acquire context to the pipe A quirk load detect >> > hack during display resume. Avoids deadlocking the entire thing. >> >> Have we seen this in the wild? References? > > My 830. Okay, just checking if the cc: stable was really warranted in this one and the next patch. Carry on! :) BR, Jani. > >> >> BR, >> Jani. >> >> > >> > Cc: stable@vger.kernel.org >> > Cc: Maarten Lankhorst >> > Fixes: e2c8b8701e2d ("drm/i915: Use atomic helpers for suspend, v2.") >> > Signed-off-by: Ville Syrjälä >> > --- >> > drivers/gpu/drm/i915/intel_display.c | 21 ++++++++++++--------- >> > 1 file changed, 12 insertions(+), 9 deletions(-) >> > >> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >> > index ed41b59ee8e3..2f76a63efe8c 100644 >> > --- a/drivers/gpu/drm/i915/intel_display.c >> > +++ b/drivers/gpu/drm/i915/intel_display.c >> > @@ -120,7 +120,8 @@ static void intel_crtc_init_scalers(struct intel_crtc *crtc, >> > static void skylake_pfit_enable(struct intel_crtc *crtc); >> > static void ironlake_pfit_disable(struct intel_crtc *crtc, bool force); >> > static void ironlake_pfit_enable(struct intel_crtc *crtc); >> > -static void intel_modeset_setup_hw_state(struct drm_device *dev); >> > +static void intel_modeset_setup_hw_state(struct drm_device *dev, >> > + struct drm_modeset_acquire_ctx *ctx); >> > static void intel_pre_disable_primary_noatomic(struct drm_crtc *crtc); >> > >> > struct intel_limit { >> > @@ -3461,7 +3462,7 @@ __intel_display_resume(struct drm_device *dev, >> > struct drm_crtc *crtc; >> > int i, ret; >> > >> > - intel_modeset_setup_hw_state(dev); >> > + intel_modeset_setup_hw_state(dev, ctx); >> > i915_redisable_vga(to_i915(dev)); >> > >> > if (!state) >> > @@ -15094,7 +15095,7 @@ int intel_modeset_init(struct drm_device *dev) >> > intel_setup_outputs(dev_priv); >> > >> > drm_modeset_lock_all(dev); >> > - intel_modeset_setup_hw_state(dev); >> > + intel_modeset_setup_hw_state(dev, dev->mode_config.acquire_ctx); >> > drm_modeset_unlock_all(dev); >> > >> > for_each_intel_crtc(dev, crtc) { >> > @@ -15131,13 +15132,13 @@ int intel_modeset_init(struct drm_device *dev) >> > return 0; >> > } >> > >> > -static void intel_enable_pipe_a(struct drm_device *dev) >> > +static void intel_enable_pipe_a(struct drm_device *dev, >> > + struct drm_modeset_acquire_ctx *ctx) >> > { >> > struct intel_connector *connector; >> > struct drm_connector_list_iter conn_iter; >> > struct drm_connector *crt = NULL; >> > struct intel_load_detect_pipe load_detect_temp; >> > - struct drm_modeset_acquire_ctx *ctx = dev->mode_config.acquire_ctx; >> > int ret; >> > >> > /* We can't just switch on the pipe A, we need to set things up with a >> > @@ -15209,7 +15210,8 @@ static bool has_pch_trancoder(struct drm_i915_private *dev_priv, >> > (HAS_PCH_LPT_H(dev_priv) && pch_transcoder == TRANSCODER_A); >> > } >> > >> > -static void intel_sanitize_crtc(struct intel_crtc *crtc) >> > +static void intel_sanitize_crtc(struct intel_crtc *crtc, >> > + struct drm_modeset_acquire_ctx *ctx) >> > { >> > struct drm_device *dev = crtc->base.dev; >> > struct drm_i915_private *dev_priv = to_i915(dev); >> > @@ -15265,7 +15267,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) >> > * resume. Force-enable the pipe to fix this, the update_dpms >> > * call below we restore the pipe to the right state, but leave >> > * the required bits on. */ >> > - intel_enable_pipe_a(dev); >> > + intel_enable_pipe_a(dev, ctx); >> > } >> > >> > /* Adjust the state of the output pipe according to whether we >> > @@ -15568,7 +15570,8 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) >> > * and sanitizes it to the current state >> > */ >> > static void >> > -intel_modeset_setup_hw_state(struct drm_device *dev) >> > +intel_modeset_setup_hw_state(struct drm_device *dev, >> > + struct drm_modeset_acquire_ctx *ctx) >> > { >> > struct drm_i915_private *dev_priv = to_i915(dev); >> > enum pipe pipe; >> > @@ -15588,7 +15591,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev) >> > for_each_pipe(dev_priv, pipe) { >> > crtc = intel_get_crtc_for_pipe(dev_priv, pipe); >> > >> > - intel_sanitize_crtc(crtc); >> > + intel_sanitize_crtc(crtc, ctx); >> > intel_dump_pipe_config(crtc, crtc->config, >> > "[setup_hw_state]"); >> > } >> >> -- >> Jani Nikula, Intel Open Source Technology Center -- Jani Nikula, Intel Open Source Technology Center