Commit 7247e1f1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.8-next-soc' of... 

Merge tag 'v5.8-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/drivers

add new functions to cmdq helper functions
- assign value to register
- export finalize function and don't call explicitely from flush async
- set specific event

* tag 'v5.8-next-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  soc: mediatek: cmdq: add set event function
  soc: mediatek: cmdq: export finalize function
  soc: mediatek: cmdq: add assign function

Link: https://lore.kernel.org/r/01399fb4-b2d0-e41b-dfd9-f2deba0ef651@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 409d01fb 7de796ca

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -492,6 +492,7 @@ static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc) 
		cmdq_pkt_clear_event(cmdq_handle, mtk_crtc->cmdq_event);

		cmdq_pkt_wfe(cmdq_handle, mtk_crtc->cmdq_event);

		mtk_crtc_ddp_config(crtc, cmdq_handle);

		cmdq_pkt_finalize(cmdq_handle);

		cmdq_pkt_flush_async(cmdq_handle, ddp_cmdq_cb, cmdq_handle);

	}

#endif

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

+40 −6
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define CMDQ_WRITE_ENABLE_MASK	BIT(0)

#define CMDQ_POLL_ENABLE_MASK	BIT(0)

#define CMDQ_EOC_IRQ_EN		BIT(0)

#define CMDQ_REG_TYPE		1



struct cmdq_instruction {

	union {
@@ -21,8 +22,17 @@ struct cmdq_instruction { 
	union {

		u16 offset;

		u16 event;

		u16 reg_dst;

	};

	union {

		u8 subsys;

		struct {

			u8 sop:5;

			u8 arg_c_t:1;

			u8 src_t:1;

			u8 dst_t:1;

		};

	};

	u8 op;

};
@@ -243,6 +253,21 @@ int cmdq_pkt_clear_event(struct cmdq_pkt *pkt, u16 event) 
}

EXPORT_SYMBOL(cmdq_pkt_clear_event);



int cmdq_pkt_set_event(struct cmdq_pkt *pkt, u16 event)

{

	struct cmdq_instruction inst = {};



	if (event >= CMDQ_MAX_EVENT)

		return -EINVAL;



	inst.op = CMDQ_CODE_WFE;

	inst.value = CMDQ_WFE_UPDATE | CMDQ_WFE_UPDATE_VALUE;

	inst.event = event;



	return cmdq_pkt_append_command(pkt, inst);

}

EXPORT_SYMBOL(cmdq_pkt_set_event);



int cmdq_pkt_poll(struct cmdq_pkt *pkt, u8 subsys,

		  u16 offset, u32 value)

{
@@ -278,7 +303,19 @@ int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys, 
}

EXPORT_SYMBOL(cmdq_pkt_poll_mask);



static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)

int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value)

{

	struct cmdq_instruction inst = {};



	inst.op = CMDQ_CODE_LOGIC;

	inst.dst_t = CMDQ_REG_TYPE;

	inst.reg_dst = reg_idx;

	inst.value = value;

	return cmdq_pkt_append_command(pkt, inst);

}

EXPORT_SYMBOL(cmdq_pkt_assign);



int cmdq_pkt_finalize(struct cmdq_pkt *pkt)

{

	struct cmdq_instruction inst = { {0} };

	int err;
@@ -297,6 +334,7 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt) 


	return err;

}

EXPORT_SYMBOL(cmdq_pkt_finalize);



static void cmdq_pkt_flush_async_cb(struct cmdq_cb_data data)

{
@@ -331,10 +369,6 @@ int cmdq_pkt_flush_async(struct cmdq_pkt *pkt, cmdq_async_flush_cb cb, 
	unsigned long flags = 0;

	struct cmdq_client *client = (struct cmdq_client *)pkt->cl;



	err = cmdq_pkt_finalize(pkt);

	if (err < 0)

		return err;



	pkt->cb.cb = cb;

	pkt->cb.data = data;

	pkt->async_cb.cb = cmdq_pkt_flush_async_cb;

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define CMDQ_JUMP_PASS			CMDQ_INST_SIZE



#define CMDQ_WFE_UPDATE			BIT(31)

#define CMDQ_WFE_UPDATE_VALUE		BIT(16)

#define CMDQ_WFE_WAIT			BIT(15)

#define CMDQ_WFE_WAIT_VALUE		0x1
@@ -59,6 +60,7 @@ enum cmdq_code { 
	CMDQ_CODE_JUMP = 0x10,

	CMDQ_CODE_WFE = 0x20,

	CMDQ_CODE_EOC = 0x40,

	CMDQ_CODE_LOGIC = 0xa0,

};



enum cmdq_cb_status {

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

+31 −0
Original line number Diff line number Diff line
@@ -120,6 +120,15 @@ int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event); 
 */

int cmdq_pkt_clear_event(struct cmdq_pkt *pkt, u16 event);



/**

 * cmdq_pkt_set_event() - append set event command to the CMDQ packet

 * @pkt:	the CMDQ packet

 * @event:	the desired event to be set

 *

 * Return: 0 for success; else the error code is returned

 */

int cmdq_pkt_set_event(struct cmdq_pkt *pkt, u16 event);



/**

 * cmdq_pkt_poll() - Append polling command to the CMDQ packet, ask GCE to

 *		     execute an instruction that wait for a specified
@@ -152,6 +161,28 @@ int cmdq_pkt_poll(struct cmdq_pkt *pkt, u8 subsys, 
 */

int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys,

		       u16 offset, u32 value, u32 mask);



/**

 * cmdq_pkt_assign() - Append logic assign command to the CMDQ packet, ask GCE

 *		       to execute an instruction that set a constant value into

 *		       internal register and use as value, mask or address in

 *		       read/write instruction.

 * @pkt:	the CMDQ packet

 * @reg_idx:	the CMDQ internal register ID

 * @value:	the specified value

 *

 * Return: 0 for success; else the error code is returned

 */

int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value);



/**

 * cmdq_pkt_finalize() - Append EOC and jump command to pkt.

 * @pkt:	the CMDQ packet

 *

 * Return: 0 for success; else the error code is returned

 */

int cmdq_pkt_finalize(struct cmdq_pkt *pkt);



/**

 * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ

 *                          packet and call back at the end of done packet

CRA Git | Maintained and supported by SUSTech CRA and CCSE