Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200622155753.130181-1-hsinyi@chromium.org>
In-Reply-To: <20200622155753.130181-1-hsinyi@chromium.org>
From:   Chun-Kuang Hu <chunkuang.hu@kernel.org>
Date:   Sat, 27 Jun 2020 10:35:46 +0800
Message-ID: <CAAOTY_-mB5EC7_fHzpn+NFPRxAHEzY-f5dRv3g1TKfR5Hui58A@mail.gmail.com>
Subject: Re: [PATCH v4] drm/mediatek: check plane visibility in atomic_update
To:     Hsin-Yi Wang <hsinyi@chromium.org>
Cc:     Linux ARM <linux-arm-kernel@lists.infradead.org>,
        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-kernel <linux-kernel@vger.kernel.org>,
        Yongqiang Niu <yongqiang.niu@mediatek.com>,
        Tomasz Figa <tfiga@chromium.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi, Hsin-Yi:

Hsin-Yi Wang <hsinyi@chromium.org> =E6=96=BC 2020=E5=B9=B46=E6=9C=8822=E6=
=97=A5 =E9=80=B1=E4=B8=80 =E4=B8=8B=E5=8D=8811:57=E5=AF=AB=E9=81=93=EF=BC=
=9A
>
> Disable the plane if it's not visible. Otherwise mtk_ovl_layer_config()
> would proceed with invalid plane and we may see vblank timeout.
>

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

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

Regards,
Chun-Kuang.

> Fixes: 119f5173628a ("drm/mediatek: Add DRM Driver for Mediatek SoC MT817=
3.")
> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
> Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
> Reviewed-by: Tomasz Figa <tfiga@chromium.org>
> ---
> v4: fix commit message
> v3: Address comment
> v2: Add fixes tag
> ---
>  drivers/gpu/drm/mediatek/mtk_drm_plane.c | 25 ++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/m=
ediatek/mtk_drm_plane.c
> index c2bd683a87c8..92141a19681b 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -164,6 +164,16 @@ static int mtk_plane_atomic_check(struct drm_plane *=
plane,
>                                                    true, true);
>  }
>
> +static void mtk_plane_atomic_disable(struct drm_plane *plane,
> +                                    struct drm_plane_state *old_state)
> +{
> +       struct mtk_plane_state *state =3D to_mtk_plane_state(plane->state=
);
> +
> +       state->pending.enable =3D false;
> +       wmb(); /* Make sure the above parameter is set before update */
> +       state->pending.dirty =3D true;
> +}
> +
>  static void mtk_plane_atomic_update(struct drm_plane *plane,
>                                     struct drm_plane_state *old_state)
>  {
> @@ -178,6 +188,11 @@ static void mtk_plane_atomic_update(struct drm_plane=
 *plane,
>         if (!crtc || WARN_ON(!fb))
>                 return;
>
> +       if (!plane->state->visible) {
> +               mtk_plane_atomic_disable(plane, old_state);
> +               return;
> +       }
> +
>         gem =3D fb->obj[0];
>         mtk_gem =3D to_mtk_gem_obj(gem);
>         addr =3D mtk_gem->dma_addr;
> @@ -200,16 +215,6 @@ static void mtk_plane_atomic_update(struct drm_plane=
 *plane,
>         state->pending.dirty =3D true;
>  }
>
> -static void mtk_plane_atomic_disable(struct drm_plane *plane,
> -                                    struct drm_plane_state *old_state)
> -{
> -       struct mtk_plane_state *state =3D to_mtk_plane_state(plane->state=
);
> -
> -       state->pending.enable =3D false;
> -       wmb(); /* Make sure the above parameter is set before update */
> -       state->pending.dirty =3D true;
> -}
> -
>  static const struct drm_plane_helper_funcs mtk_plane_helper_funcs =3D {
>         .prepare_fb =3D drm_gem_fb_prepare_fb,
>         .atomic_check =3D mtk_plane_atomic_check,
> --
> 2.27.0.111.gc72c7da667-goog
>