lkml.org 
[lkml]   [2020]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 26/58] drm/mediatek: Check plane visibility in atomic_update
    Date
    From: Hsin-Yi Wang <hsinyi@chromium.org>

    [ Upstream commit c0b8892e2461b5fa740e47efbb1269a487b04020 ]

    Disable the plane if it's not visible. Otherwise mtk_ovl_layer_config()
    would proceed with invalid plane and we may see vblank timeout.

    Fixes: 119f5173628a ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.")
    Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
    Reviewed-by: Tomasz Figa <tfiga@chromium.org>
    Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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/mediatek/mtk_drm_plane.c
    index f7e6aa1b5b7d1..83d4a710601db 100644
    --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
    +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
    @@ -108,6 +108,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 = to_mtk_plane_state(plane->state);
    +
    + state->pending.enable = false;
    + wmb(); /* Make sure the above parameter is set before update */
    + state->pending.dirty = true;
    +}
    +
    static void mtk_plane_atomic_update(struct drm_plane *plane,
    struct drm_plane_state *old_state)
    {
    @@ -122,6 +132,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 = fb->obj[0];
    mtk_gem = to_mtk_gem_obj(gem);
    addr = mtk_gem->dma_addr;
    @@ -143,16 +158,6 @@ static void mtk_plane_atomic_update(struct drm_plane *plane,
    state->pending.dirty = true;
    }

    -static void mtk_plane_atomic_disable(struct drm_plane *plane,
    - struct drm_plane_state *old_state)
    -{
    - struct mtk_plane_state *state = to_mtk_plane_state(plane->state);
    -
    - state->pending.enable = false;
    - wmb(); /* Make sure the above parameter is set before update */
    - state->pending.dirty = true;
    -}
    -
    static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = {
    .atomic_check = mtk_plane_atomic_check,
    .atomic_update = mtk_plane_atomic_update,
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-14 20:48    [W:4.053 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site