From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Patch 1/1] drm/atomic: integrate private objects with suspend/resume helpers Date: Fri, 15 Mar 2019 11:50:57 +0100 Message-ID: <20190315105057.GU2665@phenom.ffwll.local> References: <20190314134445.19260-1-bparrot@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10FA16E294 for ; Fri, 15 Mar 2019 10:51:02 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id n14so7195643edv.8 for ; Fri, 15 Mar 2019 03:51:01 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20190314134445.19260-1-bparrot@ti.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Benoit Parrot Cc: Jyri Sarha , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Peter Ujfalusi , Boris Brezillon , Tomi Valkeinen , Laurent Pinchart List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBNYXIgMTQsIDIwMTkgYXQgMDg6NDQ6NDVBTSAtMDUwMCwgQmVub2l0IFBhcnJvdCB3 cm90ZToKPiBEdXJpbmcgYSBzdXNwZW5kIGN5Y2xlIHRoZSBhdG9taWMgc3RhdGUgaXMgc2F2ZWQg dG8gYmUgdXNlZCBkdXJpbmcgdGhlCj4gcmVzdG9yZSBjeWNsZS4KPiAKPiBIb3dldmVyIHRoZSBj dXJyZW50IHN0YXRlIGR1cGxpY2F0aW9uIGxvZ2ljIGRvZXMgbm90IGR1cGxpY2F0ZSBwcml2YXRl Cj4gb2JqZWN0cy4gVGhpcyBsZWFkcyB0byBzdGF0ZSBpbmNvbnNpc3RlbmNpZXMgYXQgcmVzdW1l IHRpbWUuCj4gCj4gV2l0aCBwcml2YXRlIG9iamVjdHMgbW9kZXNldCBsb2NrIG5vdyBpbnRlZ3Jh dGVkLCB3ZSBjYW4gbWFrZSBzdXJlIHRoYXQKPiBwcml2YXRlIG9iamVjdCBzdGF0ZSBhcmUgcHJv cGVybHkgc2F2ZWQgYW5kIHJlc3RvcmVkLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEJlbm9pdCBQYXJy b3QgPGJwYXJyb3RAdGkuY29tPgoKV2h5IGRvIHlvdSBuZWVkIHRoaXM/IFdlJ3JlIGRvaW5nIGEg ZnVsbCBhdG9taWNfY2hlY2ssIGFuZCB5b3VyCmF0b21pY19jaGVjayBzaG91bGQgYmUgcHVsbGlu ZyBpbiBhbnkgcHJpdmF0ZSBzdGF0ZSBvYmplY3RzIGFuZApyZWNvbXB1dGluZyB0aGVpciBzdGF0 ZXMuIFRoaXMgc21lbGxzIGxpa2UgcGFwZXJpbmcgb3ZlciBhIGRyaXZlciBidWcuCgpUaGUgZHVw bGljYXRlIGhlbHBlcnMgc2hvdWxkIG9ubHkgbmVlZCB0byBkdXBsaWNhdGUgdGhlIHVhcGktcmVs ZXZhbnQKc3RhdGVzLCBpLmUuIGNvbm5lY3Rvci9jcnRjL3BsYW5lcy4KLURhbmllbAoKPiAtLS0K PiAgZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgfCAxNiArKysrKysrKysrKysr KysrCj4gIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2Ry bV9hdG9taWNfaGVscGVyLmMKPiBpbmRleCA1NDBhNzdhMmFkZTkuLmIxMDgwMjFjYzA5MiAxMDA2 NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCj4gQEAgLTMxODksNiArMzE4OSw3IEBA IGRybV9hdG9taWNfaGVscGVyX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAo+ICAJc3RydWN0IGRybV9jb25uZWN0b3JfbGlzdF9pdGVyIGNvbm5faXRlcjsKPiAgCXN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lOwo+ICAJc3RydWN0IGRybV9jcnRjICpjcnRjOwo+ICsJc3RydWN0 IGRybV9wcml2YXRlX29iaiAqcHJpdm9iajsKPiAgCWludCBlcnIgPSAwOwo+ICAKPiAgCXN0YXRl ID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOwo+IEBAIC0zMjE4LDYgKzMyMTksMTYgQEAg ZHJtX2F0b21pY19oZWxwZXJfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs Cj4gIAkJfQo+ICAJfQo+ICAKPiArCWRybV9mb3JfZWFjaF9wcml2b2JqKHByaXZvYmosIGRldikg ewo+ICsJCXN0cnVjdCBkcm1fcHJpdmF0ZV9zdGF0ZSAqcHJpdl9zdGF0ZTsKPiArCj4gKwkJcHJp dl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X3ByaXZhdGVfb2JqX3N0YXRlKHN0YXRlLCBwcml2b2Jq KTsKPiArCQlpZiAoSVNfRVJSKHByaXZfc3RhdGUpKSB7Cj4gKwkJCWVyciA9IFBUUl9FUlIocHJp dl9zdGF0ZSk7Cj4gKwkJCWdvdG8gZnJlZTsKPiArCQl9Cj4gKwl9Cj4gKwo+ICAJZHJtX2Nvbm5l Y3Rvcl9saXN0X2l0ZXJfYmVnaW4oZGV2LCAmY29ubl9pdGVyKTsKPiAgCWRybV9mb3JfZWFjaF9j b25uZWN0b3JfaXRlcihjb25uLCAmY29ubl9pdGVyKSB7Cj4gIAkJc3RydWN0IGRybV9jb25uZWN0 b3Jfc3RhdGUgKmNvbm5fc3RhdGU7Cj4gQEAgLTMzMjUsMTIgKzMzMzYsMTcgQEAgaW50IGRybV9h dG9taWNfaGVscGVyX2NvbW1pdF9kdXBsaWNhdGVkX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSwKPiAgCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpuZXdfY29ubl9zdGF0 ZTsKPiAgCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKPiAgCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq bmV3X2NydGNfc3RhdGU7Cj4gKwlzdHJ1Y3QgZHJtX3ByaXZhdGVfb2JqICpwcml2b2JqOwo+ICsJ c3RydWN0IGRybV9wcml2YXRlX3N0YXRlICpuZXdfcHJpdl9zdGF0ZTsKPiAgCj4gIAlzdGF0ZS0+ YWNxdWlyZV9jdHggPSBjdHg7Cj4gIAo+ICAJZm9yX2VhY2hfbmV3X3BsYW5lX2luX3N0YXRlKHN0 YXRlLCBwbGFuZSwgbmV3X3BsYW5lX3N0YXRlLCBpKQo+ICAJCXN0YXRlLT5wbGFuZXNbaV0ub2xk X3N0YXRlID0gcGxhbmUtPnN0YXRlOwo+ICAKPiArCWZvcl9lYWNoX25ld19wcml2YXRlX29ial9p bl9zdGF0ZShzdGF0ZSwgcHJpdm9iaiwgbmV3X3ByaXZfc3RhdGUsIGkpCj4gKwkJc3RhdGUtPnBy aXZhdGVfb2Jqc1tpXS5vbGRfc3RhdGUgPSBwcml2b2JqLT5zdGF0ZTsKPiArCj4gIAlmb3JfZWFj aF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUsIGkpCj4gIAkJ c3RhdGUtPmNydGNzW2ldLm9sZF9zdGF0ZSA9IGNydGMtPnN0YXRlOwo+ICAKPiAtLSAKPiAyLjE3 LjEKPiAKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3Jh dGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWw= 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=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 0E2E3C43381 for ; Fri, 15 Mar 2019 10:51:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3F3321871 for ; Fri, 15 Mar 2019 10:51:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="AYyBhiQh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728968AbfCOKvD (ORCPT ); Fri, 15 Mar 2019 06:51:03 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:33293 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728891AbfCOKvC (ORCPT ); Fri, 15 Mar 2019 06:51:02 -0400 Received: by mail-ed1-f68.google.com with SMTP id q3so557040edg.0 for ; Fri, 15 Mar 2019 03:51:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=RlLVX44gwXn7in5y8DN8YgrrFZZpsKDznLZnujeWWx4=; b=AYyBhiQhaFX8huoBDXwLtJZWEt60x72L8s0FgP84DH75gODKJWNt8g9RHel+i5E5WL B2hHYFn1eBG/7GUZnJwj44izAFNJHDG1lO2AcUWA4FluU35K5lJVPk0ED0Qeq5oXBStP 7rHB4u5K0IqQynPBtlwUsJ+FUABCr5A3JiTo4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to:user-agent; bh=RlLVX44gwXn7in5y8DN8YgrrFZZpsKDznLZnujeWWx4=; b=m5CEjy/3Zt2jY9fJvwoJiQHi4HdH8waGwzINpbJS21IMXsyCY27azlA3KIsReOvHVu yw9pBsmohrYdOsyM6EYXRdPfSJD34a48AEu9aL1qLlgOsJhmG52/aTrAHhtZX71aG4Lk hAg2g1EFU10Ld8GF1RcVxjDGyI6BP2jv+UVLo1Q4SOS2FyGiTSoNDBZYSa04UjJ/Nx1B 5DT4eHOShnaKqHaTY2vIsMOn1XIGMV712FxN6dXFzPAMzj0lB2L72OYqh8s/jPJZlIVP P3Yl/Z5yRObgHY8swycnWH7UA8njl/e3biHIdoH8cCm+KEFSZ3LYyw2BGc5C9UGa0yaV X1Qw== X-Gm-Message-State: APjAAAXyNDlIEGnK1oON+eQJAefJs+Z5J+AhOC2vq7Ucry38vS0Zw21d Gsflw94/oLKcUUOF9zRHAcjFYw== X-Google-Smtp-Source: APXvYqy/IF21L4v9D0A3uQD6kP0rhaf4p0+SwFK6y+ReX/7st2c3gYgZ9kY7OBPFhhFSdUpgJUQ8vw== X-Received: by 2002:a05:6402:2c9:: with SMTP id b9mr2396543edx.8.1552647060601; Fri, 15 Mar 2019 03:51:00 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d3sm521874edv.76.2019.03.15.03.50.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Mar 2019 03:50:59 -0700 (PDT) Date: Fri, 15 Mar 2019 11:50:57 +0100 From: Daniel Vetter To: Benoit Parrot Cc: Daniel Vetter , Rob Clark , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Boris Brezillon , Laurent Pinchart , Tomi Valkeinen , Peter Ujfalusi , Jyri Sarha Subject: Re: [Patch 1/1] drm/atomic: integrate private objects with suspend/resume helpers Message-ID: <20190315105057.GU2665@phenom.ffwll.local> Mail-Followup-To: Benoit Parrot , Rob Clark , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Boris Brezillon , Laurent Pinchart , Tomi Valkeinen , Peter Ujfalusi , Jyri Sarha References: <20190314134445.19260-1-bparrot@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190314134445.19260-1-bparrot@ti.com> X-Operating-System: Linux phenom 4.19.0-1-amd64 User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Why do you need this? We're doing a full atomic_check, and your atomic_check should be pulling in any private state objects and recomputing their states. This smells like papering over a driver bug. The duplicate helpers should only need to duplicate the uapi-relevant states, i.e. connector/crtc/planes. -Daniel > --- > 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; > > -- > 2.17.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch