Re: [PATCH v3 8/9] soc: mediatek: cmdq: add clear option in cmdq_pkt_wfe api

On 07/07/2020 17:45, Dennis YC Hsieh wrote:

Add clear parameter to let client decide if event should be clear to 0 after GCE receive it.

Change since v2:

• Keep behavior in drm crtc driver and separate bug fix code into another patch.

This, should go...

Signed-off-by: Dennis YC Hsieh dennis-yc.hsieh@mediatek.com

...here :)

I fixed to commit message and pushed the patch to v5.9-next/soc

Thanks!

drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- drivers/soc/mediatek/mtk-cmdq-helper.c | 5 +++-- include/linux/mailbox/mtk-cmdq-mailbox.h | 3 +-- include/linux/soc/mediatek/mtk-cmdq.h | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index ec6c9ffbf35e..c84e7a14d4a8 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -490,7 +490,7 @@ static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc) mbox_flush(mtk_crtc->cmdq_client->chan, 2000); cmdq_handle = cmdq_pkt_create(mtk_crtc->cmdq_client, PAGE_SIZE); cmdq_pkt_clear_event(cmdq_handle, mtk_crtc->cmdq_event);

• cmdq_pkt_wfe(cmdq_handle, mtk_crtc->cmdq_event);
  

• cmdq_pkt_wfe(cmdq_handle, mtk_crtc->cmdq_event, true);
  

  mtk_crtc_ddp_config(crtc, cmdq_handle); cmdq_pkt_finalize(cmdq_handle); cmdq_pkt_flush_async(cmdq_handle, ddp_cmdq_cb, cmdq_handle);

diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c index d55dc3296105..505651b0d715 100644 --- a/drivers/soc/mediatek/mtk-cmdq-helper.c +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c @@ -316,15 +316,16 @@ int cmdq_pkt_write_s_mask_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx, } EXPORT_SYMBOL(cmdq_pkt_write_s_mask_value);

-int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event) +int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event, bool clear) { struct cmdq_instruction inst = { {0} };

• u32 clear_option = clear ? CMDQ_WFE_UPDATE : 0;

  if (event >= CMDQ_MAX_EVENT) return -EINVAL;

  inst.op = CMDQ_CODE_WFE;

• inst.value = CMDQ_WFE_OPTION;

• inst.value = CMDQ_WFE_OPTION | clear_option; inst.event = event;

  return cmdq_pkt_append_command(pkt, inst);

diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h index efbd8a9eb2d1..d5a983d65f05 100644 --- a/include/linux/mailbox/mtk-cmdq-mailbox.h +++ b/include/linux/mailbox/mtk-cmdq-mailbox.h @@ -28,8 +28,7 @@

• bit 16-27: update value
• bit 31: 1 - update, 0 - no update

*/ -#define CMDQ_WFE_OPTION (CMDQ_WFE_UPDATE | CMDQ_WFE_WAIT | \

• 			CMDQ_WFE_WAIT_VALUE)
  

+#define CMDQ_WFE_OPTION (CMDQ_WFE_WAIT | CMDQ_WFE_WAIT_VALUE)

/** cmdq event maximum */ #define CMDQ_MAX_EVENT 0x3ff diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h index 34354e952f60..960704d75994 100644 --- a/include/linux/soc/mediatek/mtk-cmdq.h +++ b/include/linux/soc/mediatek/mtk-cmdq.h @@ -182,11 +182,12 @@ int cmdq_pkt_write_s_mask_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx, /**

• cmdq_pkt_wfe() - append wait for event command to the CMDQ packet
• @pkt: the CMDQ packet

• • @event: the desired event type to "wait and CLEAR"

• • @event: the desired event type to wait
• • @clear: clear event or not after event arrive
  • Return: 0 for success; else the error code is returned
  */

-int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event); +int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event, bool clear);

/**

• cmdq_pkt_clear_event() - append clear event command to the CMDQ packet