Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85125f66 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: hdmi: cleanup wakeup calls"

parents 85295ee6 209686b4

drivers/misc/hdcp.c

+450 −403

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/msm/mdss/mdss_hdmi_hdcp2p2.c

+440 −525

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/msm/mdss/mdss_hdmi_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ static void hdmi_tx_hdcp_cb_work(struct work_struct *work) 
			rc = hdmi_tx_config_avmute(hdmi_ctrl, true);

		}



		if (hdmi_ctrl->hpd_state) {

		if (hdmi_ctrl->hpd_state && hdmi_ctrl->panel_power_on) {

			DEV_DBG("%s: Reauthenticating\n", __func__);

			rc = hdmi_ctrl->hdcp_ops->hdmi_hdcp_reauthenticate(

				hdmi_ctrl->hdcp_feature_data);

drivers/video/msm/mdss/mdss_hdmi_util.c

+3 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ again: 


	time_out_count = wait_for_completion_timeout(

		&ddc_ctrl->ddc_sw_done, wait_time);

	DEV_DBG("ddc read done at %dms\n", jiffies_to_msecs(jiffies));



	DSS_REG_W_ND(ddc_ctrl->io, HDMI_DDC_INT_CTRL, BIT(1));

	if (!time_out_count) {
@@ -1089,6 +1090,8 @@ again: 
	time_out_count = wait_for_completion_timeout(

		&ddc_ctrl->ddc_sw_done, HZ/2);



	DEV_DBG("DDC write done at %dms\n", jiffies_to_msecs(jiffies));



	reg_val = DSS_REG_R(ddc_ctrl->io, HDMI_DDC_INT_CTRL);

	DSS_REG_W_ND(ddc_ctrl->io, HDMI_DDC_INT_CTRL, reg_val & (~BIT(2)));

	if (!time_out_count) {

include/linux/hdcp_qseecom.h

+79 −11
Original line number Diff line number Diff line
@@ -14,25 +14,93 @@ 
#define __HDCP_QSEECOM_H

#include <linux/types.h>



enum hdcp_lib_wakeup_cmd {

	HDCP_LIB_WKUP_CMD_INVALID,

	HDCP_LIB_WKUP_CMD_START,

	HDCP_LIB_WKUP_CMD_STOP,

	HDCP_LIB_WKUP_CMD_MSG_SEND_SUCCESS,

	HDCP_LIB_WKUP_CMD_MSG_SEND_FAILED,

	HDCP_LIB_WKUP_CMD_MSG_RECV_SUCCESS,

	HDCP_LIB_WKUP_CMD_MSG_RECV_FAILED,

	HDCP_LIB_WKUP_CMD_MSG_RECV_TIMEOUT,

};



enum hdmi_hdcp_wakeup_cmd {

	HDMI_HDCP_WKUP_CMD_INVALID,

	HDMI_HDCP_WKUP_CMD_SEND_MESSAGE,

	HDMI_HDCP_WKUP_CMD_RECV_MESSAGE,

	HDMI_HDCP_WKUP_CMD_STATUS_SUCCESS,

	HDMI_HDCP_WKUP_CMD_STATUS_FAILED,

	HDMI_HDCP_WKUP_CMD_AUTHENTICATE

};



struct hdcp_lib_wakeup_data {

	enum hdcp_lib_wakeup_cmd cmd;

	void *context;

	char *recvd_msg_buf;

	uint32_t recvd_msg_len;

	uint32_t timeout;

};



struct hdmi_hdcp_wakeup_data {

	enum hdmi_hdcp_wakeup_cmd cmd;

	void *context;

	char *send_msg_buf;

	uint32_t send_msg_len;

	uint32_t timeout;

};



static inline char *hdmi_hdcp_cmd_to_str(uint32_t cmd)

{

	switch (cmd) {

	case HDMI_HDCP_WKUP_CMD_SEND_MESSAGE:

		return "HDMI_HDCP_WKUP_CMD_SEND_MESSAGE";

	case HDMI_HDCP_WKUP_CMD_RECV_MESSAGE:

		return "HDMI_HDCP_WKUP_CMD_RECV_MESSAGE";

	case HDMI_HDCP_WKUP_CMD_STATUS_SUCCESS:

		return "HDMI_HDCP_WKUP_CMD_STATUS_SUCCESS";

	case HDMI_HDCP_WKUP_CMD_STATUS_FAILED:

		return "HDMI_HDCP_WKUP_CMD_STATUS_FAIL";

	case HDMI_HDCP_WKUP_CMD_AUTHENTICATE:

		return "HDMI_HDCP_WKUP_CMD_AUTHENTICATE";

	default:

		return "???";

	}

}



static inline char *hdcp_lib_cmd_to_str(uint32_t cmd)

{

	switch (cmd) {

	case HDCP_LIB_WKUP_CMD_START:

		return "HDCP_LIB_WKUP_CMD_START";

	case HDCP_LIB_WKUP_CMD_STOP:

		return "HDCP_LIB_WKUP_CMD_STOP";

	case HDCP_LIB_WKUP_CMD_MSG_SEND_SUCCESS:

		return "HDCP_LIB_WKUP_CMD_MSG_SEND_SUCCESS";

	case HDCP_LIB_WKUP_CMD_MSG_SEND_FAILED:

		return "HDCP_LIB_WKUP_CMD_MSG_SEND_FAILED";

	case HDCP_LIB_WKUP_CMD_MSG_RECV_SUCCESS:

		return "HDCP_LIB_WKUP_CMD_MSG_RECV_SUCCESS";

	case HDCP_LIB_WKUP_CMD_MSG_RECV_FAILED:

		return "HDCP_LIB_WKUP_CMD_MSG_RECV_FAILED";

	case HDCP_LIB_WKUP_CMD_MSG_RECV_TIMEOUT:

		return "HDCP_LIB_WKUP_CMD_MSG_RECV_TIMEOUT";

	default:

		return "???";

	}

}



struct hdcp_txmtr_ops {

	int (*start)(void *phdcpcontext);

	int (*stop)(void *phdcpcontext);

	int (*wakeup)(struct hdcp_lib_wakeup_data *data);

	bool (*feature_supported)(void *phdcpcontext);



	int (*process_message)(void *phdcpcontext,

		unsigned char *msg, uint32_t msg_size);

	int (*hdcp_txmtr_get_state)(void *phdcpcontext,

		uint32_t *state);

	int (*hdcp_txmtr_query_stream_type)(void *phdcpcontext);

	int (*hdcp_query_stream_type)(void *phdcpcontext);

};



struct hdcp_client_ops {

	int (*hdcp_send_message)(void *client_ctx,

		char *message, uint32_t msg_size);

	int (*hdcp_recv_message)(void *client_ctx,

		char *message, uint32_t msg_size,

		u32 timeout);

	int (*hdcp_tz_error)(void *client_ctx);

	int (*wakeup)(struct hdmi_hdcp_wakeup_data *data);

};



int hdcp_library_register(void **pphdcpcontext,