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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 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 516FEC432C0 for ; Sun, 24 Nov 2019 07:48:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27089207DD for ; Sun, 24 Nov 2019 07:48:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725948AbfKXHs5 (ORCPT ); Sun, 24 Nov 2019 02:48:57 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:36486 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725913AbfKXHs5 (ORCPT ); Sun, 24 Nov 2019 02:48:57 -0500 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:b93f:9fae:b276:a89a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 862EB283BB9; Sun, 24 Nov 2019 07:48:52 +0000 (GMT) Date: Sun, 24 Nov 2019 08:48:48 +0100 From: Boris Brezillon To: Neil Armstrong Cc: dri-devel@lists.freedesktop.org, Lucas Stach , Chris Healy , Andrey Smirnov , Nikita Yushchenko , kernel@collabora.com, Daniel Vetter , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Thierry Reding , Sam Ravnborg , Philipp Zabel , Rob Clark , Andrzej Hajda , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Rob Herring , Mark Rutland , devicetree@vger.kernel.org Subject: Re: [PATCH v3 07/21] drm/bridge: Make the bridge chain a double-linked list Message-ID: <20191124084848.33a6bf01@collabora.com> In-Reply-To: References: <20191023154512.9762-1-boris.brezillon@collabora.com> <20191023154512.9762-8-boris.brezillon@collabora.com> Organization: Collabora X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi Neil, Sorry for the late reply. On Tue, 5 Nov 2019 17:02:30 +0100 Neil Armstrong wrote: > Hi, > > > On 25/10/2019 15:29, Neil Armstrong wrote: > > On 23/10/2019 17:44, Boris Brezillon wrote: > >> So that each element in the chain can easily access its predecessor. > >> This will be needed to support bus format negotiation between elements > >> of the bridge chain. > >> > >> Signed-off-by: Boris Brezillon > >> --- > >> Changes in v3: > >> * None > >> > >> Changes in v2: > >> * Adjust things to the "dummy encoder bridge" change (patch 2 in this > >> series) > >> --- > >> drivers/gpu/drm/drm_bridge.c | 171 ++++++++++++++++++++++------------ > >> drivers/gpu/drm/drm_encoder.c | 16 +--- > >> include/drm/drm_bridge.h | 12 ++- > >> include/drm/drm_encoder.h | 9 +- > >> 4 files changed, 135 insertions(+), 73 deletions(-) > >> > >> diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c > >> index 54c874493c57..c5cf8a9c4237 100644 > >> --- a/drivers/gpu/drm/drm_bridge.c > >> +++ b/drivers/gpu/drm/drm_bridge.c > > [...] > > >> > >> @@ -426,15 +471,23 @@ EXPORT_SYMBOL(drm_atomic_bridge_chain_post_disable); > >> void drm_atomic_bridge_chain_pre_enable(struct drm_bridge *bridge, > >> struct drm_atomic_state *state) > >> { > >> + struct drm_encoder *encoder; > >> + struct drm_bridge *iter; > >> + > >> if (!bridge) > >> return; > >> > >> - drm_atomic_bridge_chain_pre_enable(bridge->next, state); > >> + encoder = bridge->encoder; > >> + list_for_each_entry_reverse(iter, &bridge->encoder->bridge_chain, > >> + chain_node) { > > This should use the encoder local variable in list_for_each_entry_reverse() > > >> + if (iter->funcs->atomic_pre_enable) > >> + iter->funcs->atomic_pre_enable(iter, state); > >> + else if (iter->funcs->pre_enable) > >> + iter->funcs->pre_enable(iter); > >> > >> - if (bridge->funcs->atomic_pre_enable) > >> - bridge->funcs->atomic_pre_enable(bridge, state); > >> - else if (bridge->funcs->pre_enable) > >> - bridge->funcs->pre_enable(bridge); > >> + if (iter == bridge) > >> + break; > >> + } > >> } > >> EXPORT_SYMBOL(drm_atomic_bridge_chain_pre_enable); > >> > >> @@ -453,15 +506,19 @@ EXPORT_SYMBOL(drm_atomic_bridge_chain_pre_enable); > >> void drm_atomic_bridge_chain_enable(struct drm_bridge *bridge, > >> struct drm_atomic_state *state) > >> { > >> + struct drm_encoder *encoder; > >> + > >> if (!bridge) > >> return; > >> > >> - if (bridge->funcs->atomic_enable) > >> - bridge->funcs->atomic_enable(bridge, state); > >> - else if (bridge->funcs->enable) > >> - bridge->funcs->enable(bridge); > >> - > >> - drm_atomic_bridge_chain_enable(bridge->next, state); > >> + encoder = bridge->encoder; > >> + list_for_each_entry_from(bridge, &bridge->encoder->bridge_chain, > >> + chain_node) { > > This should use encoder instead of bridge->encoder otherwise bridge will > change and bridge->encoder->bridge_chain won't be valid during the for_each and > cause the following : Oops, indeed. I fixed the very same problem in another helper but somehow missed those 2. Thanks for testing/reporting the bug. Boris From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [PATCH v3 07/21] drm/bridge: Make the bridge chain a double-linked list Date: Sun, 24 Nov 2019 08:48:48 +0100 Message-ID: <20191124084848.33a6bf01@collabora.com> References: <20191023154512.9762-1-boris.brezillon@collabora.com> <20191023154512.9762-8-boris.brezillon@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 920176E0F4 for ; Sun, 24 Nov 2019 07:48:56 +0000 (UTC) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Neil Armstrong Cc: Mark Rutland , dri-devel@lists.freedesktop.org, Thierry Reding , Laurent Pinchart , kernel@collabora.com, Sam Ravnborg , Nikita Yushchenko , Andrey Smirnov , Kyungmin Park , Chris Healy , devicetree@vger.kernel.org, Jonas Karlman , Rob Herring , Jernej Skrabec , Seung-Woo Kim List-Id: dri-devel@lists.freedesktop.org SGkgTmVpbCwKClNvcnJ5IGZvciB0aGUgbGF0ZSByZXBseS4KCk9uIFR1ZSwgNSBOb3YgMjAxOSAx NzowMjozMCArMDEwMApOZWlsIEFybXN0cm9uZyA8bmFybXN0cm9uZ0BiYXlsaWJyZS5jb20+IHdy b3RlOgoKPiBIaSwKPiAKPiAKPiBPbiAyNS8xMC8yMDE5IDE1OjI5LCBOZWlsIEFybXN0cm9uZyB3 cm90ZToKPiA+IE9uIDIzLzEwLzIwMTkgMTc6NDQsIEJvcmlzIEJyZXppbGxvbiB3cm90ZTogIAo+ ID4+IFNvIHRoYXQgZWFjaCBlbGVtZW50IGluIHRoZSBjaGFpbiBjYW4gZWFzaWx5IGFjY2VzcyBp dHMgcHJlZGVjZXNzb3IuCj4gPj4gVGhpcyB3aWxsIGJlIG5lZWRlZCB0byBzdXBwb3J0IGJ1cyBm b3JtYXQgbmVnb3RpYXRpb24gYmV0d2VlbiBlbGVtZW50cwo+ID4+IG9mIHRoZSBicmlkZ2UgY2hh aW4uCj4gPj4KPiA+PiBTaWduZWQtb2ZmLWJ5OiBCb3JpcyBCcmV6aWxsb24gPGJvcmlzLmJyZXpp bGxvbkBjb2xsYWJvcmEuY29tPgo+ID4+IC0tLQo+ID4+IENoYW5nZXMgaW4gdjM6Cj4gPj4gKiBO b25lCj4gPj4KPiA+PiBDaGFuZ2VzIGluIHYyOgo+ID4+ICogQWRqdXN0IHRoaW5ncyB0byB0aGUg ImR1bW15IGVuY29kZXIgYnJpZGdlIiBjaGFuZ2UgKHBhdGNoIDIgaW4gdGhpcwo+ID4+ICAgc2Vy aWVzKQo+ID4+IC0tLQo+ID4+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2JyaWRnZS5jICB8IDE3MSAr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCj4gPj4gIGRyaXZlcnMvZ3B1L2RybS9k cm1fZW5jb2Rlci5jIHwgIDE2ICstLS0KPiA+PiAgaW5jbHVkZS9kcm0vZHJtX2JyaWRnZS5oICAg ICAgfCAgMTIgKystCj4gPj4gIGluY2x1ZGUvZHJtL2RybV9lbmNvZGVyLmggICAgIHwgICA5ICst Cj4gPj4gIDQgZmlsZXMgY2hhbmdlZCwgMTM1IGluc2VydGlvbnMoKyksIDczIGRlbGV0aW9ucygt KQo+ID4+Cj4gPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYnJpZGdlLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2JyaWRnZS5jCj4gPj4gaW5kZXggNTRjODc0NDkzYzU3Li5jNWNm OGE5YzQyMzcgMTAwNjQ0Cj4gPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9icmlkZ2UuYwo+ ID4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYnJpZGdlLmMgIAo+IAo+IFsuLi5dCj4gCj4g Pj4gIAo+ID4+IEBAIC00MjYsMTUgKzQ3MSwyMyBAQCBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNf YnJpZGdlX2NoYWluX3Bvc3RfZGlzYWJsZSk7Cj4gPj4gIHZvaWQgZHJtX2F0b21pY19icmlkZ2Vf Y2hhaW5fcHJlX2VuYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlLAo+ID4+ICAJCQkJCXN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKPiA+PiAgewo+ID4+ICsJc3RydWN0IGRybV9l bmNvZGVyICplbmNvZGVyOwo+ID4+ICsJc3RydWN0IGRybV9icmlkZ2UgKml0ZXI7Cj4gPj4gKwo+ ID4+ICAJaWYgKCFicmlkZ2UpCj4gPj4gIAkJcmV0dXJuOwo+ID4+ICAKPiA+PiAtCWRybV9hdG9t aWNfYnJpZGdlX2NoYWluX3ByZV9lbmFibGUoYnJpZGdlLT5uZXh0LCBzdGF0ZSk7Cj4gPj4gKwll bmNvZGVyID0gYnJpZGdlLT5lbmNvZGVyOwo+ID4+ICsJbGlzdF9mb3JfZWFjaF9lbnRyeV9yZXZl cnNlKGl0ZXIsICZicmlkZ2UtPmVuY29kZXItPmJyaWRnZV9jaGFpbiwKPiA+PiArCQkJCSAgICBj aGFpbl9ub2RlKSB7ICAKPiAKPiBUaGlzIHNob3VsZCB1c2UgdGhlIGVuY29kZXIgbG9jYWwgdmFy aWFibGUgaW4gbGlzdF9mb3JfZWFjaF9lbnRyeV9yZXZlcnNlKCkKPiAKPiA+PiArCQlpZiAoaXRl ci0+ZnVuY3MtPmF0b21pY19wcmVfZW5hYmxlKQo+ID4+ICsJCQlpdGVyLT5mdW5jcy0+YXRvbWlj X3ByZV9lbmFibGUoaXRlciwgc3RhdGUpOwo+ID4+ICsJCWVsc2UgaWYgKGl0ZXItPmZ1bmNzLT5w cmVfZW5hYmxlKQo+ID4+ICsJCQlpdGVyLT5mdW5jcy0+cHJlX2VuYWJsZShpdGVyKTsKPiA+PiAg Cj4gPj4gLQlpZiAoYnJpZGdlLT5mdW5jcy0+YXRvbWljX3ByZV9lbmFibGUpCj4gPj4gLQkJYnJp ZGdlLT5mdW5jcy0+YXRvbWljX3ByZV9lbmFibGUoYnJpZGdlLCBzdGF0ZSk7Cj4gPj4gLQllbHNl IGlmIChicmlkZ2UtPmZ1bmNzLT5wcmVfZW5hYmxlKQo+ID4+IC0JCWJyaWRnZS0+ZnVuY3MtPnBy ZV9lbmFibGUoYnJpZGdlKTsKPiA+PiArCQlpZiAoaXRlciA9PSBicmlkZ2UpCj4gPj4gKwkJCWJy ZWFrOwo+ID4+ICsJfQo+ID4+ICB9Cj4gPj4gIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19icmlk Z2VfY2hhaW5fcHJlX2VuYWJsZSk7Cj4gPj4gIAo+ID4+IEBAIC00NTMsMTUgKzUwNiwxOSBAQCBF WFBPUlRfU1lNQk9MKGRybV9hdG9taWNfYnJpZGdlX2NoYWluX3ByZV9lbmFibGUpOwo+ID4+ICB2 b2lkIGRybV9hdG9taWNfYnJpZGdlX2NoYWluX2VuYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJp ZGdlLAo+ID4+ICAJCQkJICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKPiA+PiAg ewo+ID4+ICsJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwo+ID4+ICsKPiA+PiAgCWlmICgh YnJpZGdlKQo+ID4+ICAJCXJldHVybjsKPiA+PiAgCj4gPj4gLQlpZiAoYnJpZGdlLT5mdW5jcy0+ YXRvbWljX2VuYWJsZSkKPiA+PiAtCQlicmlkZ2UtPmZ1bmNzLT5hdG9taWNfZW5hYmxlKGJyaWRn ZSwgc3RhdGUpOwo+ID4+IC0JZWxzZSBpZiAoYnJpZGdlLT5mdW5jcy0+ZW5hYmxlKQo+ID4+IC0J CWJyaWRnZS0+ZnVuY3MtPmVuYWJsZShicmlkZ2UpOwo+ID4+IC0KPiA+PiAtCWRybV9hdG9taWNf YnJpZGdlX2NoYWluX2VuYWJsZShicmlkZ2UtPm5leHQsIHN0YXRlKTsKPiA+PiArCWVuY29kZXIg PSBicmlkZ2UtPmVuY29kZXI7Cj4gPj4gKwlsaXN0X2Zvcl9lYWNoX2VudHJ5X2Zyb20oYnJpZGdl LCAmYnJpZGdlLT5lbmNvZGVyLT5icmlkZ2VfY2hhaW4sCj4gPj4gKwkJCQkgY2hhaW5fbm9kZSkg eyAgCj4gCj4gVGhpcyBzaG91bGQgdXNlIGVuY29kZXIgaW5zdGVhZCBvZiBicmlkZ2UtPmVuY29k ZXIgb3RoZXJ3aXNlIGJyaWRnZSB3aWxsCj4gY2hhbmdlIGFuZCBicmlkZ2UtPmVuY29kZXItPmJy aWRnZV9jaGFpbiB3b24ndCBiZSB2YWxpZCBkdXJpbmcgdGhlIGZvcl9lYWNoIGFuZAo+IGNhdXNl IHRoZSBmb2xsb3dpbmcgOgoKT29wcywgaW5kZWVkLiBJIGZpeGVkIHRoZSB2ZXJ5IHNhbWUgcHJv YmxlbSBpbiBhbm90aGVyIGhlbHBlciBidXQKc29tZWhvdyBtaXNzZWQgdGhvc2UgMi4gVGhhbmtz IGZvciB0ZXN0aW5nL3JlcG9ydGluZyB0aGUgYnVnLgoKQm9yaXMKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs