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=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 DDB0EC5DF60 for ; Tue, 5 Nov 2019 16:02:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0B4D21882 for ; Tue, 5 Nov 2019 16:02:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="hCXKyUd3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389946AbfKEQCh (ORCPT ); Tue, 5 Nov 2019 11:02:37 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41908 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389571AbfKEQCg (ORCPT ); Tue, 5 Nov 2019 11:02:36 -0500 Received: by mail-wr1-f65.google.com with SMTP id p4so22014895wrm.8 for ; Tue, 05 Nov 2019 08:02:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:openpgp:autocrypt:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=kcnau1sOvsRSymMYGo5wbIn/eebsiMdeahYtMTB8G0E=; b=hCXKyUd3RrzlYyXSpMjgUSQAaPrbH/PEjmmUeD6pPMDz0Yo2JT1s/EUkKVyhKRD3pV jePfmRyoIsb43abjnpw3ErAnRQtc3rG6Yl3REgGkZTMUBjKxmiGV0XlPU8R7swYfhnrI yWxV/cpWsEjH+OR4XjfrPZhHJkc3os2Afdh4IxhgkAEAprL+gkE1jVkG3J8sp75y73Vc m/qr87QSSFN497SzfzKGwVZoEG1qe31tJfb+5f5gUN2fY9fjbhPpEhzW6LlhTGK+rR+e N94jDD5lm4KGw1DnP7cvArnRyxqBEO1ghFze6Pv7c4nDHjxNl/WFIn+c1/0MmiBXi2GY idZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:openpgp:autocrypt :organization:message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=kcnau1sOvsRSymMYGo5wbIn/eebsiMdeahYtMTB8G0E=; b=uJSP82DPqZHbDf/Rf6owodd0GKG6h5D3Csofp0E7jxhF35tdIyPqlLr9PAGox1emRg Iql/QFEWZrn/byIK5HY2WhBxbAsLjKImTQVkwlLbJlOBOWVBI9bXv/itsBpX8+vaiN1r he5/C35dV/2lY7R06AiRw2GdHr04o+t9ZVwUHvY9GexE7T+HzJHPnLWsQjhrMSiYzMJV pZmGbyGSQvwktuXnPd+Y3g7e/8cMCoaFvOVtxyrj+B2dboJKloI8beEPVWMkg0crTBUO wcG0MXmDbg0NSvRUQeQjoCodxgRrlSO0e4PH5zVpgIbNYWgvUwc6cXrhCO3O0f/30k59 OsGg== X-Gm-Message-State: APjAAAXPiScj/OqOHqsf4pI90ZPXeY97wwIxDGz+NxvlEf++B3iUy0Zh o98XNF+zuJXkAIPOIBH5ddrobXesxWomXQ== X-Google-Smtp-Source: APXvYqzKOrFIIrGQcJtglHd3gaWcxWDgLcyC5/u/7IwbDUgwRkbaAxtwDdcbVUlDkcQSi2mfcX3OxA== X-Received: by 2002:a5d:448a:: with SMTP id j10mr30775188wrq.79.1572969752477; Tue, 05 Nov 2019 08:02:32 -0800 (PST) Received: from [10.1.2.12] (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id d2sm259704wmd.2.2019.11.05.08.02.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2019 08:02:31 -0800 (PST) Subject: Re: [PATCH v3 07/21] drm/bridge: Make the bridge chain a double-linked list From: Neil Armstrong To: Boris Brezillon , dri-devel@lists.freedesktop.org Cc: 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 References: <20191023154512.9762-1-boris.brezillon@collabora.com> <20191023154512.9762-8-boris.brezillon@collabora.com> Openpgp: preference=signencrypt Autocrypt: addr=narmstrong@baylibre.com; prefer-encrypt=mutual; keydata= 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 ZaTUOEkgIor5losDrePdPgE= Organization: Baylibre Message-ID: Date: Tue, 5 Nov 2019 17:02:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 : [ 79.082861] WARNING: CPU: 2 PID: 1999 at drivers/gpu/drm/drm_bridge.c:607 drm_atomic_bridge_chain_enable+0xac/0xc0 ... [ 79.210153] drm_atomic_bridge_chain_enable+0xac/0xc0 [ 79.215156] drm_atomic_helper_commit_modeset_enables+0x138/0x248 [ 79.221190] drm_atomic_helper_commit_tail_rpm+0x2c/0x78 [ 79.226452] commit_tail+0x50/0xc0 [ 79.229815] drm_atomic_helper_commit+0xe8/0x168 [ 79.234386] drm_atomic_commit+0x48/0x58 [ 79.238269] drm_client_modeset_commit_atomic.isra.15+0x184/0x220 [ 79.244305] drm_client_modeset_commit_force+0x64/0x1a0 [ 79.249482] drm_fb_helper_restore_fbdev_mode_unlocked+0x70/0xe8 [ 79.255432] drm_fbdev_client_restore+0x14/0x20 [ 79.259920] drm_client_dev_restore+0x80/0xd8 [ 79.264231] drm_lastclose+0x4c/0x58 [ 79.267765] drm_release+0xa8/0x178 >> + if (bridge->funcs->atomic_enable) >> + bridge->funcs->atomic_enable(bridge, state); >> + else if (bridge->funcs->enable) >> + bridge->funcs->enable(bridge); >> + } >> } >> EXPORT_SYMBOL(drm_atomic_bridge_chain_enable); >> >> diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c >> index 4fe9e723e227..e555281f43d4 100644 >> --- a/drivers/gpu/drm/drm_encoder.c >> +++ b/drivers/gpu/drm/drm_encoder.c >> @@ -140,6 +140,7 @@ int drm_encoder_init(struct drm_device *dev, >> goto out_put; >> } >> >> + INIT_LIST_HEAD(&encoder->bridge_chain); >> list_add_tail(&encoder->head, &dev->mode_config.encoder_list); >> encoder->index = dev->mode_config.num_encoder++; >> >> @@ -160,23 +161,16 @@ EXPORT_SYMBOL(drm_encoder_init); >> void drm_encoder_cleanup(struct drm_encoder *encoder) >> { >> struct drm_device *dev = encoder->dev; >> + struct drm_bridge *bridge, *next; >> >> /* Note that the encoder_list is considered to be static; should we >> * remove the drm_encoder at runtime we would have to decrement all >> * the indices on the drm_encoder after us in the encoder_list. >> */ >> >> - if (encoder->bridge) { >> - struct drm_bridge *bridge; >> - struct drm_bridge *next; >> - >> - bridge = drm_bridge_chain_get_first_bridge(encoder); >> - while (bridge) { >> - next = bridge->next; >> - drm_bridge_detach(bridge); >> - bridge = next; >> - } >> - } >> + list_for_each_entry_safe(bridge, next, &encoder->bridge_chain, >> + chain_node) >> + drm_bridge_detach(bridge); >> >> drm_mode_object_unregister(dev, &encoder->base); >> kfree(encoder->name); >> diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h >> index 27eef63ce0ff..3ab16c95e59e 100644 >> --- a/include/drm/drm_bridge.h >> +++ b/include/drm/drm_bridge.h >> @@ -384,8 +384,8 @@ struct drm_bridge { >> struct drm_device *dev; >> /** @encoder: encoder to which this bridge is connected */ >> struct drm_encoder *encoder; >> - /** @next: the next bridge in the encoder chain */ >> - struct drm_bridge *next; >> + /** @chain_node: used to form a bridge chain */ >> + struct list_head chain_node; >> #ifdef CONFIG_OF >> /** @of_node: device node pointer to the bridge */ >> struct device_node *of_node; >> @@ -420,7 +420,10 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, >> static inline struct drm_bridge * >> drm_bridge_chain_get_next_bridge(struct drm_bridge *bridge) >> { >> - return bridge->next; >> + if (list_is_last(&bridge->chain_node, &bridge->encoder->bridge_chain)) >> + return NULL; >> + >> + return list_next_entry(bridge, chain_node); >> } >> >> /** >> @@ -434,7 +437,8 @@ drm_bridge_chain_get_next_bridge(struct drm_bridge *bridge) >> static inline struct drm_bridge * >> drm_bridge_chain_get_first_bridge(struct drm_encoder *encoder) >> { >> - return encoder->bridge; >> + return list_first_entry_or_null(&encoder->bridge_chain, >> + struct drm_bridge, chain_node); >> } >> >> bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge, >> diff --git a/include/drm/drm_encoder.h b/include/drm/drm_encoder.h >> index f06164f44efe..9b3dde177c81 100644 >> --- a/include/drm/drm_encoder.h >> +++ b/include/drm/drm_encoder.h >> @@ -172,7 +172,14 @@ struct drm_encoder { >> * &drm_connector_state.crtc. >> */ >> struct drm_crtc *crtc; >> - struct drm_bridge *bridge; >> + >> + /** >> + * @bridge_chain: Bridges attached to this encoder. The first entry of >> + * this list is always &drm_encoder.bridge. It may be followed by other >> + * bridge entities. >> + */ >> + struct list_head bridge_chain; >> + >> const struct drm_encoder_funcs *funcs; >> const struct drm_encoder_helper_funcs *helper_private; >> }; >> > > Reviewed-by: Neil Armstrong > With these fixed, you can keep my Reviewed-by Neil