From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 1/7] drm/i915: Fix deadlock witha the pipe A quirk during resume Date: Thu, 1 Jun 2017 19:01:07 +0300 Message-ID: <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> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3EEE76E3CA for ; Thu, 1 Jun 2017 16:01:11 +0000 (UTC) Content-Disposition: inline In-Reply-To: <87o9u7hii6.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBKdW4gMDEsIDIwMTcgYXQgMDU6NDc6NDVQTSArMDMwMCwgSmFuaSBOaWt1bGEgd3Jv dGU6Cj4gT24gVGh1LCAwMSBKdW4gMjAxNywgdmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20g d3JvdGU6Cj4gPiBGcm9tOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50 ZWwuY29tPgo+ID4KPiA+IFBhc3MgZG93biB0aGUgY29ycmVjdCBhY3F1aXJlIGNvbnRleHQgdG8g dGhlIHBpcGUgQSBxdWlyayBsb2FkIGRldGVjdAo+ID4gaGFjayBkdXJpbmcgZGlzcGxheSByZXN1 bWUuIEF2b2lkcyBkZWFkbG9ja2luZyB0aGUgZW50aXJlIHRoaW5nLgo+IAo+IEhhdmUgd2Ugc2Vl biB0aGlzIGluIHRoZSB3aWxkPyBSZWZlcmVuY2VzPwoKTXkgODMwLgoKPiAKPiBCUiwKPiBKYW5p Lgo+IAo+ID4KPiA+IENjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCj4gPiBDYzogTWFhcnRlbiBM YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiA+IEZpeGVzOiBl MmM4Yjg3MDFlMmQgKCJkcm0vaTkxNTogVXNlIGF0b21pYyBoZWxwZXJzIGZvciBzdXNwZW5kLCB2 Mi4iKQo+ID4gU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KPiA+IC0tLQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyB8IDIxICsrKysrKysrKysrKy0tLS0tLS0tLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCAx MiBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQo+ID4KPiA+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKPiA+IGluZGV4IGVkNDFiNTllZThlMy4uMmY3NmE2M2VmZThjIDEwMDY0 NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gPiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+IEBAIC0xMjAsNyArMTIw LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19pbml0X3NjYWxlcnMoc3RydWN0IGludGVsX2Ny dGMgKmNydGMsCj4gPiAgc3RhdGljIHZvaWQgc2t5bGFrZV9wZml0X2VuYWJsZShzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0Yyk7Cj4gPiAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGZpdF9kaXNhYmxlKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjLCBib29sIGZvcmNlKTsKPiA+ICBzdGF0aWMgdm9pZCBpcm9u bGFrZV9wZml0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7Cj4gPiAtc3RhdGljIHZv aWQgaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK PiA+ICtzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCj4gPiArCQkJCQkgc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4ICpj dHgpOwo+ID4gIHN0YXRpYyB2b2lkIGludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnlfbm9hdG9taWMo c3RydWN0IGRybV9jcnRjICpjcnRjKTsKPiA+ICAKPiA+ICBzdHJ1Y3QgaW50ZWxfbGltaXQgewo+ ID4gQEAgLTM0NjEsNyArMzQ2Miw3IEBAIF9faW50ZWxfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKPiA+ICAJc3RydWN0IGRybV9jcnRjICpjcnRjOwo+ID4gIAlpbnQgaSwg cmV0Owo+ID4gIAo+ID4gLQlpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKGRldik7Cj4gPiAr CWludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoZGV2LCBjdHgpOwo+ID4gIAlpOTE1X3JlZGlz YWJsZV92Z2EodG9faTkxNShkZXYpKTsKPiA+ICAKPiA+ICAJaWYgKCFzdGF0ZSkKPiA+IEBAIC0x NTA5NCw3ICsxNTA5NSw3IEBAIGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKPiA+ICAJaW50ZWxfc2V0dXBfb3V0cHV0cyhkZXZfcHJpdik7Cj4gPiAgCj4gPiAg CWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7Cj4gPiAtCWludGVsX21vZGVzZXRfc2V0dXBfaHdf c3RhdGUoZGV2KTsKPiA+ICsJaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShkZXYsIGRldi0+ bW9kZV9jb25maWcuYWNxdWlyZV9jdHgpOwo+ID4gIAlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRl dik7Cj4gPiAgCj4gPiAgCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7Cj4gPiBAQCAt MTUxMzEsMTMgKzE1MTMyLDEzIEBAIGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKPiA+ICAJcmV0dXJuIDA7Cj4gPiAgfQo+ID4gIAo+ID4gLXN0YXRpYyB2b2lk IGludGVsX2VuYWJsZV9waXBlX2Eoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiA+ICtzdGF0aWMg dm9pZCBpbnRlbF9lbmFibGVfcGlwZV9hKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gPiArCQkJ CXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4KQo+ID4gIHsKPiA+ICAJc3RydWN0 IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOwo+ID4gIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9s aXN0X2l0ZXIgY29ubl9pdGVyOwo+ID4gIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY3J0ID0gTlVM TDsKPiA+ICAJc3RydWN0IGludGVsX2xvYWRfZGV0ZWN0X3BpcGUgbG9hZF9kZXRlY3RfdGVtcDsK PiA+IC0Jc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4ICpjdHggPSBkZXYtPm1vZGVfY29u ZmlnLmFjcXVpcmVfY3R4Owo+ID4gIAlpbnQgcmV0Owo+ID4gIAo+ID4gIAkvKiBXZSBjYW4ndCBq dXN0IHN3aXRjaCBvbiB0aGUgcGlwZSBBLCB3ZSBuZWVkIHRvIHNldCB0aGluZ3MgdXAgd2l0aCBh Cj4gPiBAQCAtMTUyMDksNyArMTUyMTAsOCBAQCBzdGF0aWMgYm9vbCBoYXNfcGNoX3RyYW5jb2Rl cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gPiAgCQkoSEFTX1BDSF9MUFRf SChkZXZfcHJpdikgJiYgcGNoX3RyYW5zY29kZXIgPT0gVFJBTlNDT0RFUl9BKTsKPiA+ICB9Cj4g PiAgCj4gPiAtc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YykKPiA+ICtzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAo+ID4gKwkJCQlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKmN0 eCkKPiA+ICB7Cj4gPiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsK PiA+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwo+ ID4gQEAgLTE1MjY1LDcgKzE1MjY3LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0 YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKPiA+ICAJCSAqIHJlc3VtZS4gRm9yY2UtZW5hYmxl IHRoZSBwaXBlIHRvIGZpeCB0aGlzLCB0aGUgdXBkYXRlX2RwbXMKPiA+ICAJCSAqIGNhbGwgYmVs b3cgd2UgcmVzdG9yZSB0aGUgcGlwZSB0byB0aGUgcmlnaHQgc3RhdGUsIGJ1dCBsZWF2ZQo+ID4g IAkJICogdGhlIHJlcXVpcmVkIGJpdHMgb24uICovCj4gPiAtCQlpbnRlbF9lbmFibGVfcGlwZV9h KGRldik7Cj4gPiArCQlpbnRlbF9lbmFibGVfcGlwZV9hKGRldiwgY3R4KTsKPiA+ICAJfQo+ID4g IAo+ID4gIAkvKiBBZGp1c3QgdGhlIHN0YXRlIG9mIHRoZSBvdXRwdXQgcGlwZSBhY2NvcmRpbmcg dG8gd2hldGhlciB3ZQo+ID4gQEAgLTE1NTY4LDcgKzE1NTcwLDggQEAgZ2V0X2VuY29kZXJfcG93 ZXJfZG9tYWlucyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gPiAgICogYW5k IHNhbml0aXplcyBpdCB0byB0aGUgY3VycmVudCBzdGF0ZQo+ID4gICAqLwo+ID4gIHN0YXRpYyB2 b2lkCj4gPiAtaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQo+ID4gK2ludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKPiA+ICsJCQkgICAgIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4KQo+ ID4gIHsKPiA+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShk ZXYpOwo+ID4gIAllbnVtIHBpcGUgcGlwZTsKPiA+IEBAIC0xNTU4OCw3ICsxNTU5MSw3IEBAIGlu dGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiA+ICAJ Zm9yX2VhY2hfcGlwZShkZXZfcHJpdiwgcGlwZSkgewo+ID4gIAkJY3J0YyA9IGludGVsX2dldF9j cnRjX2Zvcl9waXBlKGRldl9wcml2LCBwaXBlKTsKPiA+ICAKPiA+IC0JCWludGVsX3Nhbml0aXpl X2NydGMoY3J0Yyk7Cj4gPiArCQlpbnRlbF9zYW5pdGl6ZV9jcnRjKGNydGMsIGN0eCk7Cj4gPiAg CQlpbnRlbF9kdW1wX3BpcGVfY29uZmlnKGNydGMsIGNydGMtPmNvbmZpZywKPiA+ICAJCQkJICAg ICAgICJbc2V0dXBfaHdfc3RhdGVdIik7Cj4gPiAgCX0KPiAKPiAtLSAKPiBKYW5pIE5pa3VsYSwg SW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKCi0tIApWaWxsZSBTeXJqw6Rsw6QK SW50ZWwgT1RDCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com ([134.134.136.20]:47593 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751155AbdFAQBW (ORCPT ); Thu, 1 Jun 2017 12:01:22 -0400 Date: Thu, 1 Jun 2017 19:01:07 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula 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 Message-ID: <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> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87o9u7hii6.fsf@intel.com> Sender: stable-owner@vger.kernel.org List-ID: 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. > > 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 -- Ville Syrj�l� Intel OTC