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=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=unavailable 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 66B72C1975A for ; Thu, 12 Mar 2020 16:44:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44D9C206F1 for ; Thu, 12 Mar 2020 16:44:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726643AbgCLQoi (ORCPT ); Thu, 12 Mar 2020 12:44:38 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:44514 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726492AbgCLQoh (ORCPT ); Thu, 12 Mar 2020 12:44:37 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (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 746EC296B45; Thu, 12 Mar 2020 16:44:35 +0000 (GMT) Date: Thu, 12 Mar 2020 17:44:32 +0100 From: Boris Brezillon To: Rob Clark Cc: Ilia Mirkin , freedreno , dri-devel , linux-arm-msm Subject: Re: [PATCH] drm/msm: avoid double-attaching hdmi/edp bridges Message-ID: <20200312174432.316e0e1d@collabora.com> In-Reply-To: References: <20200312035154.1621-1-imirkin@alum.mit.edu> Organization: Collabora X-Mailer: Claws Mail 3.17.5 (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: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Thu, 12 Mar 2020 09:19:58 -0700 Rob Clark wrote: > On Wed, Mar 11, 2020 at 8:52 PM Ilia Mirkin wrote: > > > > Each of hdmi and edp are already attached in msm_*_bridge_init. A second > > attachment returns -EBUSY, failing the driver load. > > > > Tested with HDMI on IFC6410 (APQ8064 / MDP4), but eDP case should be > > analogous. > > > > Fixes: 3ef2f119bd3ed (drm/msm: Use drm_attach_bridge() to attach a bridge to an encoder) > > Cc: Boris Brezillon > > Signed-off-by: Ilia Mirkin > > Thanks > > Reviewed-by: Rob Clark Sorry for the regression. Looks like encoder->bridge was assigned twice before my patch, and I didn't check if there were other drm_bridge_attach() calls in the driver :-/. Reviewed-by: Boris Brezillon > > > --- > > drivers/gpu/drm/msm/edp/edp.c | 4 ---- > > drivers/gpu/drm/msm/hdmi/hdmi.c | 4 ---- > > 2 files changed, 8 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/edp/edp.c b/drivers/gpu/drm/msm/edp/edp.c > > index ad4e963ccd9b..106a67473af5 100644 > > --- a/drivers/gpu/drm/msm/edp/edp.c > > +++ b/drivers/gpu/drm/msm/edp/edp.c > > @@ -178,10 +178,6 @@ int msm_edp_modeset_init(struct msm_edp *edp, struct drm_device *dev, > > goto fail; > > } > > > > - ret = drm_bridge_attach(encoder, edp->bridge, NULL); > > - if (ret) > > - goto fail; > > - > > priv->bridges[priv->num_bridges++] = edp->bridge; > > priv->connectors[priv->num_connectors++] = edp->connector; > > > > diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c > > index 1a9b6289637d..737453b6e596 100644 > > --- a/drivers/gpu/drm/msm/hdmi/hdmi.c > > +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c > > @@ -327,10 +327,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, > > goto fail; > > } > > > > - ret = drm_bridge_attach(encoder, hdmi->bridge, NULL); > > - if (ret) > > - goto fail; > > - > > priv->bridges[priv->num_bridges++] = hdmi->bridge; > > priv->connectors[priv->num_connectors++] = hdmi->connector; > > > > -- > > 2.24.1 > >