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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 CBCE7C433EF for ; Thu, 23 Sep 2021 17:27:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B2F4E61090 for ; Thu, 23 Sep 2021 17:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242578AbhIWR2y (ORCPT ); Thu, 23 Sep 2021 13:28:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238674AbhIWR2x (ORCPT ); Thu, 23 Sep 2021 13:28:53 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77E8BC061574 for ; Thu, 23 Sep 2021 10:27:21 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id t8so19389855wrq.4 for ; Thu, 23 Sep 2021 10:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Z8P/N3nWO0xQm62MFlmAAZqgDHsYeso9viJ+hbtMyd4=; b=hy7aVkeaLnbUmjeFX+DYjMGNVNYriACYfGZQyjwmls49RYDUYd3/HoBrjRYAUBcP5u WdQnR73JdNER1uCzMJocK1HW91vlAVMxtZcESqP1i97xaJzjUhusfzOq5bZNIb/07u6O PHxp1L2be2L6LFSHWSN2hvDKWp6O/aFYzk04ao59UCgXZo4CfdQEz43ubxVEWZ+YhSyY 7DAnjTjddx0gG8gorwAX2HMRpSZH3Xlg2biA8xt0TZ6xAl7dHMTaGxRx/P/jgPE9K9hy Aecwnh8Zc8otTWFXx6czDnJzLZ1teitLwEa8ByCIXrXn0AkpK3BAr9sNL8x0FgN0bPVR X+rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Z8P/N3nWO0xQm62MFlmAAZqgDHsYeso9viJ+hbtMyd4=; b=tgwSUdyW1JAXZ+/9JMr+UZ9EQkJl1f3FPkPC5DOsedHs8fMytWp2ER+XFk4un326Ic FRlQZcOSs+74tou0eGnNfHqF4pRO/HSbh2/pLAyzAsPrdst5Q0taYo68UO26r7IBH5Eo 4NVML5K75JAoTUAeg/YB1c09KkBywhYHBwJWZBhhxP2dvYezJLbHV5OZV69Cscm4BMXn t3Ued8nBwxCzujuIfDdGVORNpuBowu/Uh66NP8QDSxvAGLZhAdDrlkNV8/uMa0atmYgz xOtxNbN9ukhDQ1Gq/EBXW8pA/PE9Ozji1FURP0syBiDSxt+VaAJezTSP7vDcE4aIGSha TFmw== X-Gm-Message-State: AOAM531NQVYF/lUraM3H1gMQHcxdur7D8CNdzcQUATaw0J9ulQ1t3+2J YTjQSrIoBMXG7TCkQABG8zLa2GumU3+NHLRm98s= X-Google-Smtp-Source: ABdhPJx6UeLUNJEg4ECtZTPmdRdNxeNfodeUo9giXcpmLiqe3uXJ23JEPIV7y6k3ETipKna4LRADAw7g7juNd7bi/Bg= X-Received: by 2002:a1c:2b04:: with SMTP id r4mr5668001wmr.168.1632418040015; Thu, 23 Sep 2021 10:27:20 -0700 (PDT) MIME-Version: 1.0 References: <20210920225801.227211-1-robdclark@gmail.com> <20210920225801.227211-4-robdclark@gmail.com> In-Reply-To: From: Rob Clark Date: Thu, 23 Sep 2021 10:31:52 -0700 Message-ID: Subject: Re: [PATCH v2 3/3] drm/bridge: ti-sn65dsi86: Add NO_CONNECTOR support To: Laurent Pinchart Cc: dri-devel , freedreno , Douglas Anderson , Rob Clark , Andrzej Hajda , Neil Armstrong , Robert Foss , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 22, 2021 at 5:44 PM Laurent Pinchart wrote: > > Hi Rob, > > Thank you for the patch. > > On Mon, Sep 20, 2021 at 03:58:00PM -0700, Rob Clark wrote: > > From: Rob Clark > > > > Slightly awkward to fish out the display_info when we aren't creating > > own connector. But I don't see an obvious better way. > > > > v2: Remove error return with NO_CONNECTOR flag > > > > Signed-off-by: Rob Clark > > --- > > drivers/gpu/drm/bridge/ti-sn65dsi86.c | 39 ++++++++++++++++++++------- > > 1 file changed, 29 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c > > index 6154bed0af5b..94c94cc8a4d8 100644 > > --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c > > +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c > > @@ -667,11 +667,6 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, > > .node = NULL, > > }; > > > > - if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { > > - DRM_ERROR("Fix bridge driver to make connector optional!"); > > - return -EINVAL; > > - } > > - > > pdata->aux.drm_dev = bridge->dev; > > ret = drm_dp_aux_register(&pdata->aux); > > if (ret < 0) { > > @@ -679,9 +674,11 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, > > return ret; > > } > > > > - ret = ti_sn_bridge_connector_init(pdata); > > - if (ret < 0) > > - goto err_conn_init; > > + if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { > > + ret = ti_sn_bridge_connector_init(pdata); > > + if (ret < 0) > > + goto err_conn_init; > > + } > > > > /* > > * TODO: ideally finding host resource and dsi dev registration needs > > @@ -743,7 +740,8 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, > > err_dsi_attach: > > mipi_dsi_device_unregister(dsi); > > err_dsi_host: > > - drm_connector_cleanup(&pdata->connector); > > + if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) > > + drm_connector_cleanup(&pdata->connector); > > I wonder if we actually need this. The connector gets attached to the > encoder, won't it be destroyed by the DRM core in the error path ? This does not appear to be the case, we leak the connector if I remove this (and add a hack to trigger the error path) > > err_conn_init: > > drm_dp_aux_unregister(&pdata->aux); > > return ret; > > @@ -792,9 +790,30 @@ static void ti_sn_bridge_set_dsi_rate(struct ti_sn65dsi86 *pdata) > > regmap_write(pdata->regmap, SN_DSIA_CLK_FREQ_REG, val); > > } > > > > +/* > > + * Find the connector and fish out the bpc from display_info. It would > > + * be nice if we could get this instead from drm_bridge_state, but that > > + * doesn't yet appear to be the case. > > You already have a bus format in the bridge state, from which you can > derive the bpp. Could you give it a try ? Possibly the bridge should be converted to ->atomic_enable(), etc.. I'll leave that for another time BR, -R > > + */ > > static unsigned int ti_sn_bridge_get_bpp(struct ti_sn65dsi86 *pdata) > > { > > - if (pdata->connector.display_info.bpc <= 6) > > + struct drm_bridge *bridge = &pdata->bridge; > > + struct drm_connector_list_iter conn_iter; > > + struct drm_connector *connector; > > + unsigned bpc = 0; > > + > > + drm_connector_list_iter_begin(bridge->dev, &conn_iter); > > + drm_for_each_connector_iter(connector, &conn_iter) { > > + if (drm_connector_has_possible_encoder(connector, bridge->encoder)) { > > + bpc = connector->display_info.bpc; > > + break; > > + } > > + } > > + drm_connector_list_iter_end(&conn_iter); > > + > > + WARN_ON(bpc == 0); > > + > > + if (bpc <= 6) > > return 18; > > else > > return 24; > > -- > Regards, > > Laurent Pinchart