From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Rob Clark <robdclark@gmail.com>
Cc: freedreno <freedreno@lists.freedesktop.org>,
David Airlie <airlied@linux.ie>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Boris Brezillon <boris.brezillon@collabora.com>,
Sean Paul <sean@poorly.run>
Subject: Re: [PATCH] drm/msm: Don't attempt to attach HDMI bridge twice
Date: Thu, 19 Mar 2020 12:08:51 -0700 [thread overview]
Message-ID: <20200319190851.GB458947@yoga> (raw)
In-Reply-To: <CAF6AEGtvSZOp48hyrBUzqQLV6+twtuy6k6MLimz6fhC-dqWEVA@mail.gmail.com>
On Thu 19 Mar 11:19 PDT 2020, Rob Clark wrote:
> On Wed, Mar 18, 2020 at 9:39 PM Bjorn Andersson
> <bjorn.andersson@linaro.org> wrote:
> >
> > With the introduction of '3ef2f119bd3e ("drm/msm: Use
> > drm_attach_bridge() to attach a bridge to an encoder")' the HDMI bridge
> > is attached both in msm_hdmi_bridge_init() and later in
> > msm_hdmi_modeset_init().
> >
> > The second attempt fails as the bridge is already attached to the
> > encoder and the whole process is aborted.
> >
> > So instead make msm_hdmi_bridge_init() just initialize the hdmi_bridge
> > object and let msm_hdmi_modeset_init() attach it later.
> >
> > Fixes: 3ef2f119bd3e ("drm/msm: Use drm_attach_bridge() to attach a bridge to an encoder")
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
>
> Thanks, I think this should also be solved by:
>
> https://patchwork.freedesktop.org/patch/357331/?series=74611&rev=1
Yes, didn't find that when looking yesterday. T-b and R-b.
Thanks,
Bjorn
>
> BR,
> -R
>
> > ---
> > drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 19 +++----------------
> > 1 file changed, 3 insertions(+), 16 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
> > index 6e380db9287b..0e103ee1b730 100644
> > --- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
> > +++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
> > @@ -271,31 +271,18 @@ static const struct drm_bridge_funcs msm_hdmi_bridge_funcs = {
> > /* initialize bridge */
> > struct drm_bridge *msm_hdmi_bridge_init(struct hdmi *hdmi)
> > {
> > - struct drm_bridge *bridge = NULL;
> > struct hdmi_bridge *hdmi_bridge;
> > - int ret;
> > + struct drm_bridge *bridge;
> >
> > hdmi_bridge = devm_kzalloc(hdmi->dev->dev,
> > sizeof(*hdmi_bridge), GFP_KERNEL);
> > - if (!hdmi_bridge) {
> > - ret = -ENOMEM;
> > - goto fail;
> > - }
> > + if (!hdmi_bridge)
> > + return ERR_PTR(-ENOMEM);
> >
> > hdmi_bridge->hdmi = hdmi;
> >
> > bridge = &hdmi_bridge->base;
> > bridge->funcs = &msm_hdmi_bridge_funcs;
> >
> > - ret = drm_bridge_attach(hdmi->encoder, bridge, NULL, 0);
> > - if (ret)
> > - goto fail;
> > -
> > return bridge;
> > -
> > -fail:
> > - if (bridge)
> > - msm_hdmi_bridge_destroy(bridge);
> > -
> > - return ERR_PTR(ret);
> > }
> > --
> > 2.24.0
> >
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2020-03-20 8:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-19 4:37 [PATCH] drm/msm: Don't attempt to attach HDMI bridge twice Bjorn Andersson
2020-03-19 18:19 ` Rob Clark
2020-03-19 19:08 ` Bjorn Andersson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200319190851.GB458947@yoga \
--to=bjorn.andersson@linaro.org \
--cc=airlied@linux.ie \
--cc=boris.brezillon@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).