From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19C6BC43381 for ; Thu, 14 Mar 2019 15:55:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D840721872 for ; Thu, 14 Mar 2019 15:55:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="IXODJ79V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727818AbfCNPy7 (ORCPT ); Thu, 14 Mar 2019 11:54:59 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:55134 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727789AbfCNPyy (ORCPT ); Thu, 14 Mar 2019 11:54:54 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x2EFskie116047; Thu, 14 Mar 2019 10:54:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1552578886; bh=JuRJZcsL7dV1ONwDJpjUxO8QNMOl3XY3FrYYaCJUQiI=; h=Date:From:To:CC:Subject:References:In-Reply-To; b=IXODJ79VZ6HaVXvBnTEDKsEVYyW/dpRkhbZKNz6X6wS4G/ZX4i/u7DWFAEgv1le0s yp46hVVapc/PyZGYF7QFP16kH0Jq1UWQTbos6RMJRZHkvYqbUzTjo9JKZWi7kKfrxC GwDeCGfEQUbg3MNODGXdTZsPAoI751N5SnNttWjU= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x2EFskk1120281 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 14 Mar 2019 10:54:46 -0500 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Thu, 14 Mar 2019 10:54:46 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1591.10 via Frontend Transport; Thu, 14 Mar 2019 10:54:46 -0500 Received: from ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id x2EFsjKs004984; Thu, 14 Mar 2019 10:54:45 -0500 Date: Thu, 14 Mar 2019 10:54:48 -0500 From: Benoit Parrot To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= CC: Daniel Vetter , Rob Clark , , , Jyri Sarha , Peter Ujfalusi , Boris Brezillon , Tomi Valkeinen , Laurent Pinchart Subject: Re: [Patch 1/1] drm/atomic: integrate private objects with suspend/resume helpers Message-ID: <20190314155448.ea5wgfexnaeymdrm@ti.com> References: <20190314134445.19260-1-bparrot@ti.com> <20190314153129.GS3888@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190314153129.GS3888@intel.com> User-Agent: NeoMutt/20171215 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ville Syrjälä wrote on Thu [2019-Mar-14 17:31:29 +0200]: > On Thu, Mar 14, 2019 at 08:44:45AM -0500, Benoit Parrot wrote: > > During a suspend cycle the atomic state is saved to be used during the > > restore cycle. > > > > However the current state duplication logic does not duplicate private > > objects. This leads to state inconsistencies at resume time. > > > > With private objects modeset lock now integrated, we can make sure that > > private object state are properly saved and restored. > > > > Signed-off-by: Benoit Parrot > > --- > > drivers/gpu/drm/drm_atomic_helper.c | 16 ++++++++++++++++ > > 1 file changed, 16 insertions(+) > > > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > > index 540a77a2ade9..b108021cc092 100644 > > --- a/drivers/gpu/drm/drm_atomic_helper.c > > +++ b/drivers/gpu/drm/drm_atomic_helper.c > > @@ -3189,6 +3189,7 @@ drm_atomic_helper_duplicate_state(struct drm_device *dev, > > struct drm_connector_list_iter conn_iter; > > struct drm_plane *plane; > > struct drm_crtc *crtc; > > + struct drm_private_obj *privobj; > > int err = 0; > > > > state = drm_atomic_state_alloc(dev); > > @@ -3218,6 +3219,16 @@ drm_atomic_helper_duplicate_state(struct drm_device *dev, > > } > > } > > > > + drm_for_each_privobj(privobj, dev) { > > + struct drm_private_state *priv_state; > > + > > + priv_state = drm_atomic_get_private_obj_state(state, privobj); > > + if (IS_ERR(priv_state)) { > > + err = PTR_ERR(priv_state); > > + goto free; > > + } > > + } > > + > > drm_connector_list_iter_begin(dev, &conn_iter); > > drm_for_each_connector_iter(conn, &conn_iter) { > > struct drm_connector_state *conn_state; > > @@ -3325,12 +3336,17 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state, > > struct drm_connector_state *new_conn_state; > > struct drm_crtc *crtc; > > struct drm_crtc_state *new_crtc_state; > > + struct drm_private_obj *privobj; > > + struct drm_private_state *new_priv_state; > > > > state->acquire_ctx = ctx; > > > > for_each_new_plane_in_state(state, plane, new_plane_state, i) > > state->planes[i].old_state = plane->state; > > > > + for_each_new_private_obj_in_state(state, privobj, new_priv_state, i) > > + state->private_objs[i].old_state = privobj->state; > > + > > for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) > > state->crtcs[i].old_state = crtc->state; > > Random order between crtc vs. plane vs. connector vs. priv is tickling > my ocd nerve a bit. These loops are independent from each other. And even without this patch the order is different between drm_atomic_helper_duplicate_state() and drm_atomic_helper_commit_duplicated_state(). :) Benoit > > Otherwise looks sensible to me. > Reviewed-by: Ville Syrjälä > > > > > -- > > 2.17.1 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Ville Syrjälä > Intel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benoit Parrot Subject: Re: [Patch 1/1] drm/atomic: integrate private objects with suspend/resume helpers Date: Thu, 14 Mar 2019 10:54:48 -0500 Message-ID: <20190314155448.ea5wgfexnaeymdrm@ti.com> References: <20190314134445.19260-1-bparrot@ti.com> <20190314153129.GS3888@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by gabe.freedesktop.org (Postfix) with ESMTPS id C730D6E2E4 for ; Thu, 14 Mar 2019 15:54:53 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20190314153129.GS3888@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: linux-kernel@vger.kernel.org, Jyri Sarha , Peter Ujfalusi , Boris Brezillon , Tomi Valkeinen , dri-devel@lists.freedesktop.org, Laurent Pinchart List-Id: dri-devel@lists.freedesktop.org VmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4gd3JvdGUgb24g VGh1IFsyMDE5LU1hci0xNCAxNzozMToyOSArMDIwMF06Cj4gT24gVGh1LCBNYXIgMTQsIDIwMTkg YXQgMDg6NDQ6NDVBTSAtMDUwMCwgQmVub2l0IFBhcnJvdCB3cm90ZToKPiA+IER1cmluZyBhIHN1 c3BlbmQgY3ljbGUgdGhlIGF0b21pYyBzdGF0ZSBpcyBzYXZlZCB0byBiZSB1c2VkIGR1cmluZyB0 aGUKPiA+IHJlc3RvcmUgY3ljbGUuCj4gPiAKPiA+IEhvd2V2ZXIgdGhlIGN1cnJlbnQgc3RhdGUg ZHVwbGljYXRpb24gbG9naWMgZG9lcyBub3QgZHVwbGljYXRlIHByaXZhdGUKPiA+IG9iamVjdHMu IFRoaXMgbGVhZHMgdG8gc3RhdGUgaW5jb25zaXN0ZW5jaWVzIGF0IHJlc3VtZSB0aW1lLgo+ID4g Cj4gPiBXaXRoIHByaXZhdGUgb2JqZWN0cyBtb2Rlc2V0IGxvY2sgbm93IGludGVncmF0ZWQsIHdl IGNhbiBtYWtlIHN1cmUgdGhhdAo+ID4gcHJpdmF0ZSBvYmplY3Qgc3RhdGUgYXJlIHByb3Blcmx5 IHNhdmVkIGFuZCByZXN0b3JlZC4KPiA+IAo+ID4gU2lnbmVkLW9mZi1ieTogQmVub2l0IFBhcnJv dCA8YnBhcnJvdEB0aS5jb20+Cj4gPiAtLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p Y19oZWxwZXIuYyB8IDE2ICsrKysrKysrKysrKysrKysKPiA+ICAxIGZpbGUgY2hhbmdlZCwgMTYg aW5zZXJ0aW9ucygrKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9h dG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+ID4g aW5kZXggNTQwYTc3YTJhZGU5Li5iMTA4MDIxY2MwOTIgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ry bV9hdG9taWNfaGVscGVyLmMKPiA+IEBAIC0zMTg5LDYgKzMxODksNyBAQCBkcm1fYXRvbWljX2hl bHBlcl9kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+ICAJc3RydWN0 IGRybV9jb25uZWN0b3JfbGlzdF9pdGVyIGNvbm5faXRlcjsKPiA+ICAJc3RydWN0IGRybV9wbGFu ZSAqcGxhbmU7Cj4gPiAgCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKPiA+ICsJc3RydWN0IGRybV9w cml2YXRlX29iaiAqcHJpdm9iajsKPiA+ICAJaW50IGVyciA9IDA7Cj4gPiAgCj4gPiAgCXN0YXRl ID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOwo+ID4gQEAgLTMyMTgsNiArMzIxOSwxNiBA QCBkcm1fYXRvbWljX2hlbHBlcl9kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKPiA+ICAJCX0KPiA+ICAJfQo+ID4gIAo+ID4gKwlkcm1fZm9yX2VhY2hfcHJpdm9iaihwcml2 b2JqLCBkZXYpIHsKPiA+ICsJCXN0cnVjdCBkcm1fcHJpdmF0ZV9zdGF0ZSAqcHJpdl9zdGF0ZTsK PiA+ICsKPiA+ICsJCXByaXZfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9wcml2YXRlX29ial9zdGF0 ZShzdGF0ZSwgcHJpdm9iaik7Cj4gPiArCQlpZiAoSVNfRVJSKHByaXZfc3RhdGUpKSB7Cj4gPiAr CQkJZXJyID0gUFRSX0VSUihwcml2X3N0YXRlKTsKPiA+ICsJCQlnb3RvIGZyZWU7Cj4gPiArCQl9 Cj4gPiArCX0KPiA+ICsKPiA+ICAJZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXJfYmVnaW4oZGV2LCAm Y29ubl9pdGVyKTsKPiA+ICAJZHJtX2Zvcl9lYWNoX2Nvbm5lY3Rvcl9pdGVyKGNvbm4sICZjb25u X2l0ZXIpIHsKPiA+ICAJCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlOwo+ ID4gQEAgLTMzMjUsMTIgKzMzMzYsMTcgQEAgaW50IGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9k dXBsaWNhdGVkX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKPiA+ICAJc3Ry dWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm5ld19jb25uX3N0YXRlOwo+ID4gIAlzdHJ1Y3QgZHJt X2NydGMgKmNydGM7Cj4gPiAgCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGU7 Cj4gPiArCXN0cnVjdCBkcm1fcHJpdmF0ZV9vYmogKnByaXZvYmo7Cj4gPiArCXN0cnVjdCBkcm1f cHJpdmF0ZV9zdGF0ZSAqbmV3X3ByaXZfc3RhdGU7Cj4gPiAgCj4gPiAgCXN0YXRlLT5hY3F1aXJl X2N0eCA9IGN0eDsKPiA+ICAKPiA+ICAJZm9yX2VhY2hfbmV3X3BsYW5lX2luX3N0YXRlKHN0YXRl LCBwbGFuZSwgbmV3X3BsYW5lX3N0YXRlLCBpKQo+ID4gIAkJc3RhdGUtPnBsYW5lc1tpXS5vbGRf c3RhdGUgPSBwbGFuZS0+c3RhdGU7Cj4gPiAgCj4gPiArCWZvcl9lYWNoX25ld19wcml2YXRlX29i al9pbl9zdGF0ZShzdGF0ZSwgcHJpdm9iaiwgbmV3X3ByaXZfc3RhdGUsIGkpCj4gPiArCQlzdGF0 ZS0+cHJpdmF0ZV9vYmpzW2ldLm9sZF9zdGF0ZSA9IHByaXZvYmotPnN0YXRlOwo+ID4gKwo+ID4g IAlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUs IGkpCj4gPiAgCQlzdGF0ZS0+Y3J0Y3NbaV0ub2xkX3N0YXRlID0gY3J0Yy0+c3RhdGU7Cj4gCj4g UmFuZG9tIG9yZGVyIGJldHdlZW4gY3J0YyB2cy4gcGxhbmUgdnMuIGNvbm5lY3RvciB2cy4gcHJp diBpcyB0aWNrbGluZwo+IG15IG9jZCBuZXJ2ZSBhIGJpdC4KClRoZXNlIGxvb3BzIGFyZSBpbmRl cGVuZGVudCBmcm9tIGVhY2ggb3RoZXIuCkFuZCBldmVuIHdpdGhvdXQgdGhpcyBwYXRjaCB0aGUg b3JkZXIgaXMgZGlmZmVyZW50IGJldHdlZW4KZHJtX2F0b21pY19oZWxwZXJfZHVwbGljYXRlX3N0 YXRlKCkgYW5kCmRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9kdXBsaWNhdGVkX3N0YXRlKCkuIDop CgpCZW5vaXQKCj4gCj4gT3RoZXJ3aXNlIGxvb2tzIHNlbnNpYmxlIHRvIG1lLgo+IFJldmlld2Vk LWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgo+IAo+ ID4gIAo+ID4gLS0gCj4gPiAyLjE3LjEKPiA+IAo+ID4gX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KPiA+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiA+IGRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiA+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCj4gCj4gLS0gCj4gVmlsbGUgU3lyasOk bMOkCj4gSW50ZWwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs