From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Paul Subject: Re: [PATCH 1/2] drm/i915: Call intel_dp_mst_resume() before resuming displays Date: Tue, 29 Mar 2016 10:11:54 -0400 Message-ID: <1459260714.15060.2.camel@redhat.com> References: <1457711822-20335-1-git-send-email-cpaul@redhat.com> <1457711822-20335-2-git-send-email-cpaul@redhat.com> <20160313184526.GL14170@phenom.ffwll.local> <1458164993.5551.1.camel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1458164993.5551.1.camel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" List-Id: dri-devel@lists.freedesktop.org YnVtcAoKQ291bGQgd2UgZ2V0IGEgcmV2aWV3ZWQtYnkgZm9yIHRoaXMgcGF0Y2g/IEl0J3MgbmVl ZGVkIGluIGFkZGl0aW9uIHRvIHRoZSBwYXRjaApzZXJpZXMgSSBzZW50IGZvciByZW1vdmluZyBp bnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgpIGZvciB0aGUgVDU2MCB0byBoYXZlIGl0J3MKbW9uaXRv cnMgd29yayBwcm9wZXJseSBvbiByZXN1bWUuCgpPbiBXZWQsIDIwMTYtMDMtMTYgYXQgMTc6NDkg LTA0MDAsIEx5dWRlIFBhdWwgd3JvdGU6Cj4gT24gU3VuLCAyMDE2LTAzLTEzIGF0IDE5OjQ1ICsw MTAwLCBEYW5pZWwgVmV0dGVyIHdyb3RlOgo+ID4gCj4gPiBPbiBGcmksIE1hciAxMSwgMjAxNiBh dCAxMDo1NzowMUFNIC0wNTAwLCBMeXVkZSB3cm90ZToKPiA+ID4gCj4gPiA+IAo+ID4gPiBTaW5j ZSB3ZSBuZWVkIE1TVCBkZXZpY2VzIHJlYWR5IGJlZm9yZSB3ZSB0cnkgdG8gcmVzdW1lIGRpc3Bs YXlzLAo+ID4gPiBjYWxsaW5nIHRoaXMgYWZ0ZXIgaW50ZWxfZGlzcGxheV9yZXN1bWUoKSBjYW4g cmVzdWx0IGluIHNvbWUgaXNzdWVzIHdpdGgKPiA+ID4gdmFyaW91cyBsYXB0b3AgZG9ja3Mgd2hl cmUgdGhlIG1vbml0b3Igd29uJ3QgdHVybiBiYWNrIG9uIGFmdGVyCj4gPiA+IHN1c3BlbmRpbmcg dGhlIHN5c3RlbS4KPiA+ID4gCj4gPiA+IFRoaXMgb3JkZXIgd2FzIG9yaWdpbmFsbHkgY2hhbmdl ZCBpbgo+ID4gPiAKPiA+ID4gCWNvbW1pdCBlN2Q2ZjdkNzA4MjkgKCJkcm0vaTkxNTogcmVzdW1l IE1TVCBhZnRlciByZWFkaW5nIGJhY2sgaHcgc3RhdGUiKQo+ID4gPiAKPiA+ID4gSW4gb3JkZXIg dG8gZml4IHNvbWUgdW5jbGFpbWVkIHJlZ2lzdGVyIGVycm9ycywgaG93ZXZlciB0aGUgYWN0dWFs IGNhdXNlCj4gPiA+IG9mIHRob3NlIGhhcyBzaW5jZSBiZWVuIGZpeGVkLgo+ID4gPiAKPiA+ID4g Q0M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPiA+ID4gU2lnbmVkLW9mZi1ieTogTHl1ZGUgPGNw YXVsQHJlZGhhdC5jb20+Cj4gPiBEb24ndCB3ZSBuZWVkIHRvIGZpcnN0IGFwcGx5IHBhdGNoIDIv MiB0byBhdm9pZCBicmVha2luZyBzeXN0ZW1zCj4gPiBpbi1iZXR3ZWVuPwo+ID4gLURhbmllbAo+ IEFGQUlDVCB0aGUgd2FybnMgZG9uJ3QgYXBwZWFyIGV2ZW4gd2l0aCB0aGlzIHBhdGNoLCBzbyBu by4KPiA+IAo+ID4gCj4gPiA+IAo+ID4gPiAKPiA+ID4gLS0tCj4gPiA+IMKgZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYyB8IDQgKystLQo+ID4gPiDCoDEgZmlsZSBjaGFuZ2VkLCAyIGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4gPiA+IAo+ID4gPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+ID4gPiBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKPiA+ID4gaW5kZXggZjM1NzA1OC4uMDg4NTRhZSAxMDA2NDQKPiA+ID4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+ID4gPiArKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gPiA+IEBAIC03NjEsMTIgKzc2MSwxMiBAQCBzdGF0aWMg aW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ID4gPiDCoAkJZGV2 X3ByaXYtPmRpc3BsYXkuaHBkX2lycV9zZXR1cChkZXYpOwo+ID4gPiDCoAlzcGluX3VubG9ja19p cnEoJmRldl9wcml2LT5pcnFfbG9jayk7Cj4gPiA+IMKgCj4gPiA+ICsJaW50ZWxfZHBfbXN0X3Jl c3VtZShkZXYpOwo+ID4gPiArCj4gPiA+IMKgCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7Cj4g PiA+IMKgCWludGVsX2Rpc3BsYXlfcmVzdW1lKGRldik7Cj4gPiA+IMKgCWRybV9tb2Rlc2V0X3Vu bG9ja19hbGwoZGV2KTsKPiA+ID4gwqAKPiA+ID4gLQlpbnRlbF9kcF9tc3RfcmVzdW1lKGRldik7 Cj4gPiA+IC0KPiA+ID4gwqAJLyoKPiA+ID4gwqAJwqAqIC4uLiBidXQgYWxzbyBuZWVkIHRvIG1h a2Ugc3VyZSB0aGF0IGhvdHBsdWcgcHJvY2Vzc2luZwo+ID4gPiDCoAnCoCogZG9lc24ndCBjYXVz ZSBoYXZvYy4gTGlrZSBpbiB0aGUgZHJpdmVyIGxvYWQgY29kZSB3ZSBkb24ndAo+ID4gPiAtLcKg Cj4gPiA+IDIuNS4wCj4gPiA+IAo+ID4gPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwo+ID4gPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gPiA+IEludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiA+ID4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKPiBfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKLS0gCkNoZWVycywKCUx5dWRlCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:46664 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756068AbcC2OL4 (ORCPT ); Tue, 29 Mar 2016 10:11:56 -0400 Message-ID: <1459260714.15060.2.camel@redhat.com> Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915: Call intel_dp_mst_resume() before resuming displays From: Lyude Paul To: Daniel Vetter Cc: David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., " "linux-kernel@vger.kernel.org open list" , stable@vger.kernel.org Date: Tue, 29 Mar 2016 10:11:54 -0400 In-Reply-To: <1458164993.5551.1.camel@redhat.com> References: <1457711822-20335-1-git-send-email-cpaul@redhat.com> <1457711822-20335-2-git-send-email-cpaul@redhat.com> <20160313184526.GL14170@phenom.ffwll.local> <1458164993.5551.1.camel@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: bump Could we get a reviewed-by for this patch? It's needed in addition to the patch series I sent for removing intel_dp_dpcd_read_wake() for the T560 to have it's monitors work properly on resume. On Wed, 2016-03-16 at 17:49 -0400, Lyude Paul wrote: > On Sun, 2016-03-13 at 19:45 +0100, Daniel Vetter wrote: > > > > On Fri, Mar 11, 2016 at 10:57:01AM -0500, Lyude wrote: > > > > > > > > > Since we need MST devices ready before we try to resume displays, > > > calling this after intel_display_resume() can result in some issues with > > > various laptop docks where the monitor won't turn back on after > > > suspending the system. > > > > > > This order was originally changed in > > > > > > commit e7d6f7d70829 ("drm/i915: resume MST after reading back hw state") > > > > > > In order to fix some unclaimed register errors, however the actual cause > > > of those has since been fixed. > > > > > > CC: stable@vger.kernel.org > > > Signed-off-by: Lyude > > Don't we need to first apply patch 2/2 to avoid breaking systems > > in-between? > > -Daniel > AFAICT the warns don't appear even with this patch, so no. > > > > > > > > > > > > > --- > > >  drivers/gpu/drm/i915/i915_drv.c | 4 ++-- > > >  1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.c > > > b/drivers/gpu/drm/i915/i915_drv.c > > > index f357058..08854ae 100644 > > > --- a/drivers/gpu/drm/i915/i915_drv.c > > > +++ b/drivers/gpu/drm/i915/i915_drv.c > > > @@ -761,12 +761,12 @@ static int i915_drm_resume(struct drm_device *dev) > > >   dev_priv->display.hpd_irq_setup(dev); > > >   spin_unlock_irq(&dev_priv->irq_lock); > > >   > > > + intel_dp_mst_resume(dev); > > > + > > >   drm_modeset_lock_all(dev); > > >   intel_display_resume(dev); > > >   drm_modeset_unlock_all(dev); > > >   > > > - intel_dp_mst_resume(dev); > > > - > > >   /* > > >    * ... but also need to make sure that hotplug processing > > >    * doesn't cause havoc. Like in the driver load code we don't > > > --  > > > 2.5.0 > > > > > > _______________________________________________ > > > Intel-gfx mailing list > > > Intel-gfx@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Cheers, Lyude