Merge "msm: mdss: hdmi: refactor event handler" (8755c106) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_hdmi_tx.c

+451 −302

File changed.

Preview size limit exceeded, changes collapsed.

+7 −1

Original line number	Diff line number	Diff line
		@@ -121,6 +121,9 @@ struct hdmi_video_config {
		struct hdmi_avi_infoframe_config avi_iframe;
		};

		struct hdmi_tx_ctrl;
		typedef int (hdmi_tx_evt_handler) (struct hdmi_tx_ctrl );

		struct hdmi_tx_ctrl {
		struct platform_device *pdev;
		u32 hdmi_tx_ver;
		@@ -184,7 +187,7 @@ struct hdmi_tx_ctrl {
		void *downstream_data;
		void *audio_data;

		void *feature_data[HDMI_TX_FEAT_MAX];
		void *feature_data[hweight8(HDMI_TX_FEAT_MAX)];
		struct hdmi_hdcp_ops *hdcp_ops;
		void *hdcp_data;
		bool hdcp22_present;
		@@ -200,6 +203,9 @@ struct hdmi_tx_ctrl {

		char disp_switch_name[MAX_SWITCH_NAME_SIZE];
		bool power_data_enable[HDMI_TX_MAX_PM];

		hdmi_tx_evt_handler evt_handler[MDSS_EVENT_MAX];
		void *evt_arg;
		};

		#endif /* __MDSS_HDMI_TX_H__ */

+8 −6

Original line number	Diff line number	Diff line
		@@ -368,12 +368,14 @@
		#define HDMI_DEFAULT_TIMEOUT_HSYNC 28571

		enum hdmi_tx_feature_type {
		HDMI_TX_FEAT_EDID,
		HDMI_TX_FEAT_HDCP,
		HDMI_TX_FEAT_HDCP2P2,
		HDMI_TX_FEAT_CEC_HW,
		HDMI_TX_FEAT_CEC_ABST,
		HDMI_TX_FEAT_MAX,
		HDMI_TX_FEAT_EDID = BIT(0),
		HDMI_TX_FEAT_HDCP = BIT(1),
		HDMI_TX_FEAT_HDCP2P2 = BIT(2),
		HDMI_TX_FEAT_CEC_HW = BIT(3),
		HDMI_TX_FEAT_CEC_ABST = BIT(4),
		HDMI_TX_FEAT_MAX = HDMI_TX_FEAT_EDID \| HDMI_TX_FEAT_HDCP \|
		HDMI_TX_FEAT_HDCP2P2 \| HDMI_TX_FEAT_CEC_HW \|
		HDMI_TX_FEAT_CEC_ABST
		};

		enum hdmi_tx_scdc_access_type {

+1 −0

Original line number	Diff line number	Diff line
		@@ -260,6 +260,7 @@ enum mdss_intf_events {
		MDSS_EVENT_DSI_RECONFIG_CMD,
		MDSS_EVENT_DSI_RESET_WRITE_PTR,
		MDSS_EVENT_PANEL_TIMING_SWITCH,
		MDSS_EVENT_MAX,
		};

		struct lcd_panel_info {