MIME-Version: 1.0
References: <20211028074311.57842-1-angelogioacchino.delregno@collabora.com> <000ba19e-0220-f5c3-0efd-abb8338bb8f2@collabora.com>
In-Reply-To: <000ba19e-0220-f5c3-0efd-abb8338bb8f2@collabora.com>
From:   Chun-Kuang Hu <chunkuang.hu@kernel.org>
Date:   Mon, 13 Dec 2021 21:08:15 +0800
Message-ID: <CAAOTY_87ugiuo+nz2D1upTX+oO8r3yHHLsU3r07qkpvu3UESDQ@mail.gmail.com>
Subject: Re: [PATCH] drm/mediatek: hdmi: Perform NULL pointer check for mtk_hdmi_conf
To:     AngeloGioacchino Del Regno 
        <angelogioacchino.delregno@collabora.com>
Cc:     Chun-Kuang Hu <chunkuang.hu@kernel.org>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        DRI Development <dri-devel@lists.freedesktop.org>,
        "moderated list:ARM/Mediatek SoC support" 
        <linux-mediatek@lists.infradead.org>,
        Linux ARM <linux-arm-kernel@lists.infradead.org>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
        Collabora Kernel ML <kernel@collabora.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

 Hi, Angelo:

AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> =E6=96=
=BC
2021=E5=B9=B412=E6=9C=8813=E6=97=A5 =E9=80=B1=E4=B8=80 =E4=B8=8B=E5=8D=886:=
02=E5=AF=AB=E9=81=93=EF=BC=9A
>
> Il 28/10/21 09:43, AngeloGioacchino Del Regno ha scritto:
> > In commit 41ca9caaae0b ("drm/mediatek: hdmi: Add check for CEA modes on=
ly")
> > a check for CEA modes was added to function mtk_hdmi_bridge_mode_valid(=
)
> > in order to address possible issues on MT8167; moreover, with commit
> > c91026a938c2 ("drm/mediatek: hdmi: Add optional limit on maximal HDMI m=
ode clock")
> > another similar check was introduced.
> >
> > Unfortunately though, at the time of writing, MT8173 does not provide
> > any mtk_hdmi_conf structure and this is crashing the kernel with NULL
> > pointer upon entering mtk_hdmi_bridge_mode_valid(), which happens as
> > soon as a HDMI cable gets plugged in.
> >
> > To fix this regression, add a NULL pointer check for hdmi->conf in the
> > said function, restoring HDMI functionality and avoiding NULL pointer
> > kernel panics.
> >
> > Fixes: 41ca9caaae0b ("drm/mediatek: hdmi: Add check for CEA modes only"=
)
> > Fixes: c91026a938c2 ("drm/mediatek: hdmi: Add optional limit on maximal=
 HDMI mode clock")
> > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@co=
llabora.com>
> > ---
> >   drivers/gpu/drm/mediatek/mtk_hdmi.c | 12 +++++++-----
> >   1 file changed, 7 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/medi=
atek/mtk_hdmi.c
> > index 5838c44cbf6f..3196189429bc 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> > @@ -1224,12 +1224,14 @@ static int mtk_hdmi_bridge_mode_valid(struct dr=
m_bridge *bridge,
> >                       return MODE_BAD;
> >       }
> >
> > -     if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode))
> > -             return MODE_BAD;
> > +     if (hdmi->conf) {
> > +             if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mod=
e))
> > +                     return MODE_BAD;
> >
> > -     if (hdmi->conf->max_mode_clock &&
> > -         mode->clock > hdmi->conf->max_mode_clock)
> > -             return MODE_CLOCK_HIGH;
> > +             if (hdmi->conf->max_mode_clock &&
> > +                 mode->clock > hdmi->conf->max_mode_clock)
> > +                     return MODE_CLOCK_HIGH;
> > +     }
> >
> >       if (mode->clock < 27000)
> >               return MODE_CLOCK_LOW;
> >
>
> Hello, friendly ping!
>
> Can I please get a review (or merge) of this commit?
>
> This is an important fix for a null pointer KP and restores HDMI function=
ality.

Applied to mediatek-drm-fixes [1], thanks.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/=
log/?h=3Dmediatek-drm-fixes

Regards,
Chun-Kuang.

>
> Thanks,
> - Angelo