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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0293C433EF for ; Fri, 1 Oct 2021 17:57:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A784861283 for ; Fri, 1 Oct 2021 17:57:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355595AbhJAR7l (ORCPT ); Fri, 1 Oct 2021 13:59:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355546AbhJAR7k (ORCPT ); Fri, 1 Oct 2021 13:59:40 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AFBEC061775; Fri, 1 Oct 2021 10:57:55 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id v17so16705199wrv.9; Fri, 01 Oct 2021 10:57:55 -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=vb73lg9qsqwiLmqj85NjUPL2xZVz8BzLOB9BceFTR54=; b=iKrOVmWDyChr95wi0Eq5QO8i+oz/O3kLyjfsadbWMX4hO+WBoI+OIMQZxE1dLkZGWM /XoObslVzWTfjtdK1Cfc9UCe6IesS3bcjuhEF2CNAszzjlTzjlezvdDICJuw0JnVhXzZ WMLUdLRpDT24l46SofDJO1s85nOVl77XCDgRKnySR/Ys0ImYngf2rsFwFnRkyLqExXUq TDI5vIIHrqwz1mRAlXjRb1csubqWR4sZ+MucNgLf/OrCElqIXTmLZZIZN3advEO/QYRs 5UDCBPL124qq9zc2QfMiJ9+G1eabUxNDa7g2vLeVcPAwEEVIkDVkbiozKI2GBpycLFeE ZsAg== 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=vb73lg9qsqwiLmqj85NjUPL2xZVz8BzLOB9BceFTR54=; b=BMtxEEwuKz2avunY4c+daVYUbvzeI3ffJ9bg5HZV/OzoNUlZkYzwtzGWe88Y5nZH9l 2y/Ee6m/9SetcFiTZpcHIa3aFXIH9EzRZa1YqCCWr7MpbO1anzUL9m0yM77quwIYuvQP Nj9MaFcQX983Q6YPMvYM7XDZjqZrN4Np1LsJ/AIHqOUAmr5TguvqG+PsEcegsjSEBKMj DuENYxQMVxzQUfv3hmXAAQjT4FcA5wmHcJojT7LPA7d8H6SBuiJBqYGurSvNVVY7nrO2 j8M/yPGmzJl9WyI5hN9Sef5ShvKyzEgrJWJxQivee+rOtaaXJ7+btGvkmufd2f2XFId/ 9qlg== X-Gm-Message-State: AOAM530nQ+H9pZxzCEff7XQRqAGH+XabXXT5ra62PgpzEFDts67bLKjh jqipnN8ly89zsKAobVIY0AzJCVkA7nJWY25Tr+4= X-Google-Smtp-Source: ABdhPJytVyeFma0MtJUTeP9fqX/qokpdavenH1L8LAggVgfF26XCTfWt9vkXs6TbhVUk+tgO9aYRvxTlnv1n1o47bl8= X-Received: by 2002:adf:a289:: with SMTP id s9mr2359018wra.260.1633111073891; Fri, 01 Oct 2021 10:57:53 -0700 (PDT) MIME-Version: 1.0 References: <20210920225801.227211-1-robdclark@gmail.com> <20210920225801.227211-2-robdclark@gmail.com> In-Reply-To: From: Rob Clark Date: Fri, 1 Oct 2021 11:02:27 -0700 Message-ID: Subject: Re: [PATCH v2 1/3] drm/msm/dsi: Support NO_CONNECTOR bridges To: Dmitry Baryshkov Cc: dri-devel , freedreno , Douglas Anderson , Laurent Pinchart , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Abhinav Kumar , Bjorn Andersson , "open list:DRM DRIVER FOR MSM ADRENO GPU" , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 1, 2021 at 10:28 AM Dmitry Baryshkov wrote: > > On 21/09/2021 01:57, Rob Clark wrote: > > From: Rob Clark > > > > For now, since we have a mix of bridges which support this flag, which > > which do *not* support this flag, or work both ways, try it once with > > NO_CONNECTOR and then fall back to the old way if that doesn't work. > > Eventually we can drop the fallback path. > > > > v2: Add missing drm_connector_attach_encoder() so display actually comes > > up when the bridge properly handles the NO_CONNECTOR flag > > > > Signed-off-by: Rob Clark > > Reviewed-by: Laurent Pinchart > > Reviewed-by: Dmitry Baryshkov > > I think this patch can go through the drm/msm, while two other patches > would need to through the drm-misc. Is it correct? Correct, I made sure things worked in either order (ie. with msm patch but without bridge patches, and visa versa), so they can land through different trees BR, -R > > > --- > > drivers/gpu/drm/msm/Kconfig | 2 ++ > > drivers/gpu/drm/msm/dsi/dsi_manager.c | 50 ++++++++++++++++++++------- > > 2 files changed, 39 insertions(+), 13 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig > > index e9c6af78b1d7..36e5ba3ccc28 100644 > > --- a/drivers/gpu/drm/msm/Kconfig > > +++ b/drivers/gpu/drm/msm/Kconfig > > @@ -14,6 +14,8 @@ config DRM_MSM > > select REGULATOR > > select DRM_KMS_HELPER > > select DRM_PANEL > > + select DRM_BRIDGE > > + select DRM_PANEL_BRIDGE > > select DRM_SCHED > > select SHMEM > > select TMPFS > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c > > index c41d39f5b7cf..e25877073d31 100644 > > --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c > > +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c > > @@ -3,6 +3,8 @@ > > * Copyright (c) 2015, The Linux Foundation. All rights reserved. > > */ > > > > +#include "drm/drm_bridge_connector.h" > > + > > #include "msm_kms.h" > > #include "dsi.h" > > > > @@ -688,10 +690,10 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) > > { > > struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); > > struct drm_device *dev = msm_dsi->dev; > > + struct drm_connector *connector; > > struct drm_encoder *encoder; > > struct drm_bridge *int_bridge, *ext_bridge; > > - struct drm_connector *connector; > > - struct list_head *connector_list; > > + int ret; > > > > int_bridge = msm_dsi->bridge; > > ext_bridge = msm_dsi->external_bridge = > > @@ -699,22 +701,44 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) > > > > encoder = msm_dsi->encoder; > > > > - /* link the internal dsi bridge to the external bridge */ > > - drm_bridge_attach(encoder, ext_bridge, int_bridge, 0); > > - > > /* > > - * we need the drm_connector created by the external bridge > > - * driver (or someone else) to feed it to our driver's > > - * priv->connector[] list, mainly for msm_fbdev_init() > > + * Try first to create the bridge without it creating its own > > + * connector.. currently some bridges support this, and others > > + * do not (and some support both modes) > > */ > > - connector_list = &dev->mode_config.connector_list; > > + ret = drm_bridge_attach(encoder, ext_bridge, int_bridge, > > + DRM_BRIDGE_ATTACH_NO_CONNECTOR); > > + if (ret == -EINVAL) { > > + struct drm_connector *connector; > > + struct list_head *connector_list; > > + > > + /* link the internal dsi bridge to the external bridge */ > > + drm_bridge_attach(encoder, ext_bridge, int_bridge, 0); > > + > > + /* > > + * we need the drm_connector created by the external bridge > > + * driver (or someone else) to feed it to our driver's > > + * priv->connector[] list, mainly for msm_fbdev_init() > > + */ > > + connector_list = &dev->mode_config.connector_list; > > > > - list_for_each_entry(connector, connector_list, head) { > > - if (drm_connector_has_possible_encoder(connector, encoder)) > > - return connector; > > + list_for_each_entry(connector, connector_list, head) { > > + if (drm_connector_has_possible_encoder(connector, encoder)) > > + return connector; > > + } > > + > > + return ERR_PTR(-ENODEV); > > + } > > + > > + connector = drm_bridge_connector_init(dev, encoder); > > + if (IS_ERR(connector)) { > > + DRM_ERROR("Unable to create bridge connector\n"); > > + return ERR_CAST(connector); > > } > > > > - return ERR_PTR(-ENODEV); > > + drm_connector_attach_encoder(connector, encoder); > > + > > + return connector; > > } > > > > void msm_dsi_manager_bridge_destroy(struct drm_bridge *bridge) > > > > > -- > With best wishes > Dmitry