Re: [PATCH v4] drm/mediatek: clear pending flag when cmdq packet is done.

Hi, Yongqiang:

Yongqiang Niu yongqiang.niu@mediatek.com 於 2021年8月11日 週三 上午9:48寫道：

In cmdq mode, packet may be flushed before it is executed, so the pending flag should be cleared after cmdq packet is done.

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

[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?...

Regards, Chun-Kuang.

Signed-off-by: Yongqiang Niu yongqiang.niu@mediatek.com

drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 47 +++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index 4c25e33..89f093d 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -267,6 +267,36 @@ static void ddp_cmdq_cb(struct mbox_client *cl, void *mssg) { struct mtk_drm_crtc *mtk_crtc = container_of(cl, struct mtk_drm_crtc, cmdq_cl); struct cmdq_cb_data *data = mssg;

•   struct mtk_crtc_state *state;
  

•   unsigned int i;
  

•   state = to_mtk_crtc_state(mtk_crtc->base.state);
  

•   state->pending_config = false;
  

•   if (mtk_crtc->pending_planes) {
  

•           for (i = 0; i < mtk_crtc->layer_nr; i++) {
  

•                   struct drm_plane *plane = &mtk_crtc->planes[i];
  

•                   struct mtk_plane_state *plane_state;
  

•                   plane_state = to_mtk_plane_state(plane->state);
  

•                   plane_state->pending.config = false;
  

•           }
  

•           mtk_crtc->pending_planes = false;
  

•   }
  

•   if (mtk_crtc->pending_async_planes) {
  

•           for (i = 0; i < mtk_crtc->layer_nr; i++) {
  

•                   struct drm_plane *plane = &mtk_crtc->planes[i];
  

•                   struct mtk_plane_state *plane_state;
  

•                   plane_state = to_mtk_plane_state(plane->state);
  

•                   plane_state->pending.async_config = false;
  

•           }
  

•           mtk_crtc->pending_async_planes = false;
  

•   }
  
    mtk_crtc->cmdq_vblank_cnt = 0;
    mtk_drm_cmdq_pkt_destroy(mtk_crtc->cmdq_chan, data->pkt);
  

@@ -423,7 +453,8 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, state->pending_vrefresh, 0, cmdq_handle);

•           state->pending_config = false;
  

•           if (!cmdq_handle)
  

•                   state->pending_config = false;
    }
  
    if (mtk_crtc->pending_planes) {
  

@@ -443,9 +474,12 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, mtk_ddp_comp_layer_config(comp, local_layer, plane_state, cmdq_handle);

•                   plane_state->pending.config = false;
  

•                   if (!cmdq_handle)
  

•                           plane_state->pending.config = false;
            }
  

•           mtk_crtc->pending_planes = false;
  

•           if (!cmdq_handle)
  

•                   mtk_crtc->pending_planes = false;
    }
  
    if (mtk_crtc->pending_async_planes) {
  

@@ -465,9 +499,12 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, mtk_ddp_comp_layer_config(comp, local_layer, plane_state, cmdq_handle);

•                   plane_state->pending.async_config = false;
  

•                   if (!cmdq_handle)
  

•                           plane_state->pending.async_config = false;
            }
  

•           mtk_crtc->pending_async_planes = false;
  

•           if (!cmdq_handle)
  

•                   mtk_crtc->pending_async_planes = false;
    }
  

}

-- 1.8.1.1.dirty