From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2] drm/i915: Do a better job at disabling primary plane in the noatomic case. Date: Mon, 23 Nov 2015 10:25:28 +0100 Message-ID: <5652DB88.9070208@linux.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> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 3FEE16E48A for ; Mon, 23 Nov 2015 01:28:16 -0800 (PST) In-Reply-To: <1447421309.2593.21.camel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ander Conselvan De Oliveira , intel-gfx@lists.freedesktop.org Cc: "Tomas M." , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T3AgMTMtMTEtMTUgb20gMTQ6Mjggc2NocmVlZiBBbmRlciBDb25zZWx2YW4gRGUgT2xpdmVpcmE6 Cj4gT24gVGh1LCAyMDE1LTExLTEyIGF0IDE0OjU4ICswMTAwLCBNYWFydGVuIExhbmtob3JzdCB3 cm90ZToKPj4gT3AgMTItMTEtMTUgb20gMTQ6Mzcgc2NocmVlZiBBbmRlciBDb25zZWx2YW4gRGUg T2xpdmVpcmE6Cj4+PiBPbiBXZWQsIDIwMTUtMTEtMTEgYXQgMTU6MzYgKzAxMDAsIE1hYXJ0ZW4g TGFua2hvcnN0IHdyb3RlOgo+Pj4+IFdoZW4gZGlzYWJsZV9ub2F0b21pYyBpcyBjYWxsZWQgcGxh bmVfbWFzayBpcyBub3QgcmVsaWFibGUgeWV0LAo+Pj4+IGFuZCBwbGFuZV9zdGF0ZS0+dmlzaWJs ZSA9IHRydWUgZXZlbiBhZnRlciBkaXNhYmxpbmcgdGhlIHByaW1hcnkgcGxhbmUuCj4+PiBTbyB0 aGUgc3RhbGUgdmFsdWUgb2YgcGxhbmVfc3RhdGUtPnZpc2libGUgY2F1c2VzIGEgc3Vic2VxdWVu dCBtb2Rlc2V0IHRvCj4+PiBlbmFibGUKPj4+IHRoZSBwcmltYXJ5IGFnYWluPwo+PiBQcm9iYWJs eSBub3QgYmVjYXVzZSBpdCB3b3VsZCBnZXQgcmVjYWxjdWxhdGVkIGluIGNhbGNfY2hhbmdlcywg YnV0IGl0IHNob3VsZAo+PiByZWFsbHkgYmUgc2V0IHRvIGZhbHNlIGFmdGVyd2FyZHMuCj4gU28g YmFzaWNhbGx5IEkgZGlkbid0IHVuZGVyc3RhbmQgaG93IHRoZSB3cm9uZyB2YWx1ZSBvZiBwbGFu ZV9zdGF0ZS0+dmlzaWJsZQo+IGNhdXNlcyB0aGUgYnVnIHRoYXQgd2FzIG1lbnRpb25lZC4gSSB0 aGluayBhIGJyaWVmIGV4cGxhbmF0aW9uIGluIHRoZSBjb21taXQKPiBtZXNzYWdlIHdvdWxkIGJl IGdvb2QuCldlbGwsIGFwcGx5IHdpdGggZ2l0IGFtIC0tc2Npc3NvcnMuIFNhbWUgcGF0Y2ggYnV0 IG1lbnRpb25pbmcgdGhpcy4KCklzIHRoaXMgYmV0dGVyPwotLS0tPjgtLS0tLQoKV2hlbiBkaXNh YmxlX25vYXRvbWljIGlzIGNhbGxlZCBwbGFuZV9tYXNrIGlzIG5vdCBjb3JyZWN0IHlldCwKYW5k IHBsYW5lX3N0YXRlLT52aXNpYmxlID0gdHJ1ZSBpcyBsZWZ0IGFzIHRydWUgYWZ0ZXIgZGlzYWJs aW5nCnRoZSBwcmltYXJ5IHBsYW5lLgoKT3RoZXIgcGxhbmVzIGFyZSBhbHJlYWR5IGRpc2FibGVk IGFzIHBhcnQgb2YgY3J0YyBzYW5pdGl6YXRpb24sIG9ubHkgdGhlCnByaW1hcnkgaXMgbGVmdCBh Y3RpdmUuIEJ1dCB0aGUgcGxhbmVfbWFzayBpcyBub3QgdXBkYXRlZCBoZXJlLiBJdCBnZXRzIHVw ZGF0ZWQKZHVyaW5nIGZiIHRha2VvdmVyIGluIG1vZGVzZXRfZ2VtX2luaXQsIG9yIHNldCB0byB0 aGUgbmV3IHZhbHVlIG9uIHJlc3VtZS4KClRoaXMgbWVhbnMgdGhhdCB0byBkaXNhYmxlIHRoZSBw cmltYXJ5IHBsYW5lIDEgPDwgZHJtX3BsYW5lX2luZGV4KHByaW1hcnkpCm5lZWRzIHRvIGJlIHVz ZWQuCgpBZnRlcndhcmRzIGJlY2F1c2UgdGhlIGNydGMgaXMgbm8gbG9uZ2VyIGFjdGl2ZSBpdCdz IGZvcmJpZGRlbiB0byBrZWVwCnBsYW5lX3N0YXRlLT52aXNpYmxlIHNldCwgb3IgYSBXQVJOX09O IGluIGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMKdHJpZ2dlcnMuIFRoZXJlIGFyZSBv dGhlciBjb2RlIHBvaW50cyB0aGF0IHJlbHkgb24gYWNjdXJhdGUgcGxhbmVfc3RhdGUtPnZpc2li bGUKdG9vLCBzbyBtYWtlIHN1cmUgdGhlIGJvb2wgaXMgY2xlYXJlZC4KCgpUaGUgb3RoZXIgcGxh bmVzIGFyZSBhbHJlYWR5IGRpc2FibGVkIGluIGludGVsX3Nhbml0aXplX2NydGMsIHNvCnRoZXkg ZG9uJ3QgaGF2ZSB0byBiZSBoYW5kbGVkIGhlcmUuCgpDYzogc3RhYmxlQHZnZXIua2VybmVsLm9y ZyAjdjQuMywgdjQuMj8KQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hv d19idWcuY2dpP2lkPTkyNjU1ClRlc3RlZC1ieTogVG9tYXMgTWV6emFkcmEgPHRtZXp6YWRyYUBn bWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto b3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIHwgNCArKystCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAxIGRlbGV0 aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGI1Zjc0OTMyMTNi Ny4uYmMzMjgyYWI1ZWQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC02 MjY3LDkgKzYyNjcsMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX25vYXRvbWlj KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJV0FSTl9PTihpbnRlbF9jcnRjLT51bnBpbl93b3Jr KTsKIAogCQlpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KGNydGMpOworCisJCWludGVsX2NydGNf ZGlzYWJsZV9wbGFuZXMoY3J0YywgMSA8PCBkcm1fcGxhbmVfaW5kZXgoY3J0Yy0+cHJpbWFyeSkp OworCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShjcnRjLT5wcmltYXJ5LT5zdGF0ZSktPnZpc2libGUg PSBmYWxzZTsKIAl9CiAKLQlpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKGNydGMsIGNydGMtPnN0 YXRlLT5wbGFuZV9tYXNrKTsKIAlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7 CiAJaW50ZWxfY3J0Yy0+YWN0aXZlID0gZmFsc2U7CiAJaW50ZWxfdXBkYXRlX3dhdGVybWFya3Mo Y3J0Yyk7Ci0tIDIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com ([192.55.52.93]:15201 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753928AbbKWJ2Q (ORCPT ); Mon, 23 Nov 2015 04:28:16 -0500 Subject: [PATCH v2] drm/i915: Do a better job at disabling primary plane in the noatomic case. To: Ander Conselvan De Oliveira , intel-gfx@lists.freedesktop.org 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> Cc: "Tomas M." , stable@vger.kernel.org From: Maarten Lankhorst Message-ID: <5652DB88.9070208@linux.intel.com> Date: Mon, 23 Nov 2015 10:25:28 +0100 MIME-Version: 1.0 In-Reply-To: <1447421309.2593.21.camel@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: 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. 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