Commit 23c22299 authored by Dennis YC Hsieh's avatar Dennis YC Hsieh Committed by Matthias Brugger
Browse files

soc: mediatek: cmdq: add clear option in cmdq_pkt_wfe api 



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

Signed-off-by: default avatarDennis YC Hsieh <dennis-yc.hsieh@mediatek.com>
Acked-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://lore.kernel.org/r/1594136714-11650-9-git-send-email-dennis-yc.hsieh@mediatek.com


[mb: fix commit message]
Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent 946f1792

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,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);

drivers/soc/mediatek/mtk-cmdq-helper.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

include/linux/mailbox/mtk-cmdq-mailbox.h

+1 −2
Original line number Diff line number Diff line
@@ -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

include/linux/soc/mediatek/mtk-cmdq.h

+3 −2
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE