Merge "msm: mdss: hdmi: Proper DDC power off sequence" (c61daf5a) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_hdmi_hdcp.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1185,9 +1185,6 @@ void hdmi_hdcp_off(void *input)

		DSS_REG_W(io, HDMI_HDCP_RESET, BIT(0));

		/* Wait to be clean on DDC HW engine */
		hdmi_hdcp_hw_ddc_clean(hdcp_ctrl);

		/* Disable encryption and disable the HDCP block */
		DSS_REG_W(io, HDMI_HDCP_CTRL, 0);

+9 −2

Original line number	Diff line number	Diff line
		@@ -1074,8 +1074,12 @@ static void hdmi_tx_hpd_int_work(struct work_struct *work)
		hdmi_tx_set_audio_switch_node(hdmi_ctrl, 0, false);
		hdmi_tx_wait_for_audio_engine(hdmi_ctrl);

		if (hdmi_tx_enable_power(hdmi_ctrl, HDMI_TX_DDC_PM, false))
		DEV_WARN("%s: Failed to disable ddc power\n", __func__);
		if (!hdmi_ctrl->panel_power_on) {
		if (hdmi_tx_enable_power(hdmi_ctrl, HDMI_TX_DDC_PM,
		false))
		DEV_WARN("%s: Failed to disable ddc power\n",
		__func__);
		}

		hdmi_tx_send_cable_notification(hdmi_ctrl, 0);
		DEV_INFO("%s: sense cable DISCONNECTED: state switch to %d\n",
		@@ -2467,6 +2471,9 @@ static void hdmi_tx_power_off_work(struct work_struct *work)
		hdmi_hdcp_off(hdmi_ctrl->feature_data[HDMI_TX_FEAT_HDCP]);
		}

		if (hdmi_tx_enable_power(hdmi_ctrl, HDMI_TX_DDC_PM, false))
		DEV_WARN("%s: Failed to disable ddc power\n", __func__);

		if (!hdmi_tx_is_dvi_mode(hdmi_ctrl))
		hdmi_tx_audio_off(hdmi_ctrl);