From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v2] drm/i915: Do a better job at disabling primary plane in the noatomic case. Date: Thu, 10 Dec 2015 14:47:17 +0200 Message-ID: <87y4d2jwru.fsf@intel.com> References: <1447252573-26167-1-git-send-email-maarten.lankhorst@linux.intel.com> <1447335466.2774.13.camel@gmail.com> <56449B16.2050001@linux.intel.com> <1447421309.2593.21.camel@gmail.com> <5652DB88.9070208@linux.intel.com> <20151210083346.GU20822@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D95D6E9C7 for ; Thu, 10 Dec 2015 04:47:31 -0800 (PST) In-Reply-To: <20151210083346.GU20822@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org, "Tomas M." , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAxMCBEZWMgMjAxNSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90 ZToKPiBPbiBNb24sIE5vdiAyMywgMjAxNSBhdCAxMDoyNToyOEFNICswMTAwLCBNYWFydGVuIExh bmtob3JzdCB3cm90ZToKPj4gT3AgMTMtMTEtMTUgb20gMTQ6Mjggc2NocmVlZiBBbmRlciBDb25z ZWx2YW4gRGUgT2xpdmVpcmE6Cj4+ID4gT24gVGh1LCAyMDE1LTExLTEyIGF0IDE0OjU4ICswMTAw LCBNYWFydGVuIExhbmtob3JzdCB3cm90ZToKPj4gPj4gT3AgMTItMTEtMTUgb20gMTQ6Mzcgc2No cmVlZiBBbmRlciBDb25zZWx2YW4gRGUgT2xpdmVpcmE6Cj4+ID4+PiBPbiBXZWQsIDIwMTUtMTEt MTEgYXQgMTU6MzYgKzAxMDAsIE1hYXJ0ZW4gTGFua2hvcnN0IHdyb3RlOgo+PiA+Pj4+IFdoZW4g ZGlzYWJsZV9ub2F0b21pYyBpcyBjYWxsZWQgcGxhbmVfbWFzayBpcyBub3QgcmVsaWFibGUgeWV0 LAo+PiA+Pj4+IGFuZCBwbGFuZV9zdGF0ZS0+dmlzaWJsZSA9IHRydWUgZXZlbiBhZnRlciBkaXNh YmxpbmcgdGhlIHByaW1hcnkgcGxhbmUuCj4+ID4+PiBTbyB0aGUgc3RhbGUgdmFsdWUgb2YgcGxh bmVfc3RhdGUtPnZpc2libGUgY2F1c2VzIGEgc3Vic2VxdWVudCBtb2Rlc2V0IHRvCj4+ID4+PiBl bmFibGUKPj4gPj4+IHRoZSBwcmltYXJ5IGFnYWluPwo+PiA+PiBQcm9iYWJseSBub3QgYmVjYXVz ZSBpdCB3b3VsZCBnZXQgcmVjYWxjdWxhdGVkIGluIGNhbGNfY2hhbmdlcywgYnV0IGl0IHNob3Vs ZAo+PiA+PiByZWFsbHkgYmUgc2V0IHRvIGZhbHNlIGFmdGVyd2FyZHMuCj4+ID4gU28gYmFzaWNh bGx5IEkgZGlkbid0IHVuZGVyc3RhbmQgaG93IHRoZSB3cm9uZyB2YWx1ZSBvZiBwbGFuZV9zdGF0 ZS0+dmlzaWJsZQo+PiA+IGNhdXNlcyB0aGUgYnVnIHRoYXQgd2FzIG1lbnRpb25lZC4gSSB0aGlu ayBhIGJyaWVmIGV4cGxhbmF0aW9uIGluIHRoZSBjb21taXQKPj4gPiBtZXNzYWdlIHdvdWxkIGJl IGdvb2QuCj4+IFdlbGwsIGFwcGx5IHdpdGggZ2l0IGFtIC0tc2Npc3NvcnMuIFNhbWUgcGF0Y2gg YnV0IG1lbnRpb25pbmcgdGhpcy4KPj4gCj4+IElzIHRoaXMgYmV0dGVyPwo+PiAtLS0tPjgtLS0t LQo+PiAKPj4gV2hlbiBkaXNhYmxlX25vYXRvbWljIGlzIGNhbGxlZCBwbGFuZV9tYXNrIGlzIG5v dCBjb3JyZWN0IHlldCwKPj4gYW5kIHBsYW5lX3N0YXRlLT52aXNpYmxlID0gdHJ1ZSBpcyBsZWZ0 IGFzIHRydWUgYWZ0ZXIgZGlzYWJsaW5nCj4+IHRoZSBwcmltYXJ5IHBsYW5lLgo+PiAKPj4gT3Ro ZXIgcGxhbmVzIGFyZSBhbHJlYWR5IGRpc2FibGVkIGFzIHBhcnQgb2YgY3J0YyBzYW5pdGl6YXRp b24sIG9ubHkgdGhlCj4+IHByaW1hcnkgaXMgbGVmdCBhY3RpdmUuIEJ1dCB0aGUgcGxhbmVfbWFz ayBpcyBub3QgdXBkYXRlZCBoZXJlLiBJdCBnZXRzIHVwZGF0ZWQKPj4gZHVyaW5nIGZiIHRha2Vv dmVyIGluIG1vZGVzZXRfZ2VtX2luaXQsIG9yIHNldCB0byB0aGUgbmV3IHZhbHVlIG9uIHJlc3Vt ZS4KPj4gCj4+IFRoaXMgbWVhbnMgdGhhdCB0byBkaXNhYmxlIHRoZSBwcmltYXJ5IHBsYW5lIDEg PDwgZHJtX3BsYW5lX2luZGV4KHByaW1hcnkpCj4+IG5lZWRzIHRvIGJlIHVzZWQuCj4+IAo+PiBB ZnRlcndhcmRzIGJlY2F1c2UgdGhlIGNydGMgaXMgbm8gbG9uZ2VyIGFjdGl2ZSBpdCdzIGZvcmJp ZGRlbiB0byBrZWVwCj4+IHBsYW5lX3N0YXRlLT52aXNpYmxlIHNldCwgb3IgYSBXQVJOX09OIGlu IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMKPj4gdHJpZ2dlcnMuIFRoZXJlIGFyZSBv dGhlciBjb2RlIHBvaW50cyB0aGF0IHJlbHkgb24gYWNjdXJhdGUgcGxhbmVfc3RhdGUtPnZpc2li bGUKPj4gdG9vLCBzbyBtYWtlIHN1cmUgdGhlIGJvb2wgaXMgY2xlYXJlZC4KPgo+IE9oIGRlYXIg aXMgdGhpcyBhIG1lc3MgOigKPgo+IEFzIGEgYnVnZml4IHRoaXMgaXMgUmV2aWV3ZWQtYnk6IERh bmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CgpQdXNoZWQgdG8gZHJtLWludGVs LWZpeGVzLCB0aGFua3MgZm9yIHRoZSBwYXRjaCBhbmQgcmV2aWV3LgoKQlIsCkphbmkuCgo+Cj4g QnV0IHdlIG5lZWQgdG8gYnJpbmcgYSBfbG90XyBtb3JlIHNhbml0eSB0byB0aGlzIGluIC1uZXh0 LiBXb3VsZCBwcm9iYWJseQo+IGJlIGJldHRlciBpZiB3ZSBrZWVwIHRoZSBwcmltYXJ5IHBsYW5l IHN0YXRlIGFsbCBjb25zaXN0ZW50LCBhbmQgdGhlbgo+IGNsZWFyIGJvdGggdmlzaWJsZSBhbmQg cGxhbmVfbWFzayB3aGVuIGZiIHJlY29uc3RydWN0aW9uIGZhaWxzLgo+Cj4gQWxzbywgc29tZSBX QVJOX09OIHRvIGJpdGNoIGFib3V0IGluY29uc2lzdGVuY3kgYmV0d2VlbiBwbGFuZV9tYXNrIGFu ZAo+IC0+dmlzaWJsZSBpbiB0aGUgZGlzYWJsZSBjb2RlIHBhdGhzIHdvdWxkIGJlIGdvb2QgSSB0 aGluay4KPiAtRGFuaWVsCj4KPj4gCj4+IAo+PiBUaGUgb3RoZXIgcGxhbmVzIGFyZSBhbHJlYWR5 IGRpc2FibGVkIGluIGludGVsX3Nhbml0aXplX2NydGMsIHNvCj4+IHRoZXkgZG9uJ3QgaGF2ZSB0 byBiZSBoYW5kbGVkIGhlcmUuCj4+IAo+PiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZyAjdjQu MywgdjQuMj8KPj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19i dWcuY2dpP2lkPTkyNjU1Cj4+IFRlc3RlZC1ieTogVG9tYXMgTWV6emFkcmEgPHRtZXp6YWRyYUBn bWFpbC5jb20+Cj4+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxh bmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4+IC0tLQo+PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIHwgNCArKystCj4+ICAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25z KCspLCAxIGRlbGV0aW9uKC0pCj4+IAo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j Cj4+IGluZGV4IGI1Zjc0OTMyMTNiNy4uYmMzMjgyYWI1ZWQyIDEwMDY0NAo+PiAtLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+IEBAIC02MjY3LDkgKzYyNjcsMTEgQEAgc3RhdGljIHZv aWQgaW50ZWxfY3J0Y19kaXNhYmxlX25vYXRvbWljKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPj4g IAkJV0FSTl9PTihpbnRlbF9jcnRjLT51bnBpbl93b3JrKTsKPj4gIAo+PiAgCQlpbnRlbF9wcmVf ZGlzYWJsZV9wcmltYXJ5KGNydGMpOwo+PiArCj4+ICsJCWludGVsX2NydGNfZGlzYWJsZV9wbGFu ZXMoY3J0YywgMSA8PCBkcm1fcGxhbmVfaW5kZXgoY3J0Yy0+cHJpbWFyeSkpOwo+PiArCQl0b19p bnRlbF9wbGFuZV9zdGF0ZShjcnRjLT5wcmltYXJ5LT5zdGF0ZSktPnZpc2libGUgPSBmYWxzZTsK Pj4gIAl9Cj4+ICAKPj4gLQlpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKGNydGMsIGNydGMtPnN0 YXRlLT5wbGFuZV9tYXNrKTsKPj4gIAlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0 Yyk7Cj4+ICAJaW50ZWxfY3J0Yy0+YWN0aXZlID0gZmFsc2U7Cj4+ICAJaW50ZWxfdXBkYXRlX3dh dGVybWFya3MoY3J0Yyk7Cj4+IC0tIDIuMS4wCj4+IAo+PiBfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwo+PiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4+IElu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBP cGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com ([192.55.52.115]:39087 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753870AbbLJMrb (ORCPT ); Thu, 10 Dec 2015 07:47:31 -0500 From: Jani Nikula To: Daniel Vetter , Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org, "Tomas M." , stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: Do a better job at disabling primary plane in the noatomic case. In-Reply-To: <20151210083346.GU20822@phenom.ffwll.local> References: <1447252573-26167-1-git-send-email-maarten.lankhorst@linux.intel.com> <1447335466.2774.13.camel@gmail.com> <56449B16.2050001@linux.intel.com> <1447421309.2593.21.camel@gmail.com> <5652DB88.9070208@linux.intel.com> <20151210083346.GU20822@phenom.ffwll.local> Date: Thu, 10 Dec 2015 14:47:17 +0200 Message-ID: <87y4d2jwru.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: stable-owner@vger.kernel.org List-ID: On Thu, 10 Dec 2015, Daniel Vetter wrote: > On Mon, Nov 23, 2015 at 10:25:28AM +0100, Maarten Lankhorst wrote: >> Op 13-11-15 om 14:28 schreef Ander Conselvan De Oliveira: >> > On Thu, 2015-11-12 at 14:58 +0100, Maarten Lankhorst wrote: >> >> Op 12-11-15 om 14:37 schreef Ander Conselvan De Oliveira: >> >>> On Wed, 2015-11-11 at 15:36 +0100, Maarten Lankhorst wrote: >> >>>> When disable_noatomic is called plane_mask is not reliable yet, >> >>>> and plane_state->visible = true even after disabling the primary plane. >> >>> So the stale value of plane_state->visible causes a subsequent modeset to >> >>> enable >> >>> the primary again? >> >> Probably not because it would get recalculated in calc_changes, but it should >> >> really be set to false afterwards. >> > So basically I didn't understand how the wrong value of plane_state->visible >> > causes the bug that was mentioned. I think a brief explanation in the commit >> > message would be good. >> Well, apply with git am --scissors. Same patch but mentioning this. >> >> Is this better? >> ---->8----- >> >> When disable_noatomic is called plane_mask is not correct yet, >> and plane_state->visible = true is left as true after disabling >> the primary plane. >> >> Other planes are already disabled as part of crtc sanitization, only the >> primary is left active. But the plane_mask is not updated here. It gets updated >> during fb takeover in modeset_gem_init, or set to the new value on resume. >> >> This means that to disable the primary plane 1 << drm_plane_index(primary) >> needs to be used. >> >> Afterwards because the crtc is no longer active it's forbidden to keep >> plane_state->visible set, or a WARN_ON in intel_plane_atomic_calc_changes >> triggers. There are other code points that rely on accurate plane_state->visible >> too, so make sure the bool is cleared. > > Oh dear is this a mess :( > > As a bugfix this is Reviewed-by: Daniel Vetter Pushed to drm-intel-fixes, thanks for the patch and review. BR, Jani. > > But we need to bring a _lot_ more sanity to this in -next. Would probably > be better if we keep the primary plane state all consistent, and then > clear both visible and plane_mask when fb reconstruction fails. > > Also, some WARN_ON to bitch about inconsistency between plane_mask and > ->visible in the disable code paths would be good I think. > -Daniel > >> >> >> The other planes are already disabled in intel_sanitize_crtc, so >> they don't have to be handled here. >> >> Cc: stable@vger.kernel.org #v4.3, v4.2? >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92655 >> Tested-by: Tomas Mezzadra >> Signed-off-by: Maarten Lankhorst >> --- >> drivers/gpu/drm/i915/intel_display.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >> index b5f7493213b7..bc3282ab5ed2 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -6267,9 +6267,11 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc) >> WARN_ON(intel_crtc->unpin_work); >> >> intel_pre_disable_primary(crtc); >> + >> + intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary)); >> + to_intel_plane_state(crtc->primary->state)->visible = false; >> } >> >> - intel_crtc_disable_planes(crtc, crtc->state->plane_mask); >> dev_priv->display.crtc_disable(crtc); >> intel_crtc->active = false; >> intel_update_watermarks(crtc); >> -- 2.1.0 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center