Merge "msm: mdss: hdmi: return cable status only when HDMI is powered" (28413d8c) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_hdmi_tx.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -2784,7 +2784,7 @@ static int hdmi_tx_get_cable_status(struct platform_device *pdev, u32 vote)
		}

		spin_lock_irqsave(&hdmi_ctrl->hpd_state_lock, flags);
		hpd = hdmi_ctrl->hpd_state;
		hpd = hdmi_ctrl->hpd_state && hdmi_ctrl->panel_power_on;
		spin_unlock_irqrestore(&hdmi_ctrl->hpd_state_lock, flags);

		hdmi_ctrl->vote_hdmi_core_on = false;
		@@ -3233,10 +3233,6 @@ static int hdmi_tx_power_on(struct mdss_panel_data *panel_data)
		return rc;
		}

		mutex_lock(&hdmi_ctrl->power_mutex);
		hdmi_ctrl->panel_power_on = true;
		mutex_unlock(&hdmi_ctrl->power_mutex);

		hdmi_cec_config(hdmi_ctrl->feature_data[HDMI_TX_FEAT_CEC]);

		if (hdmi_ctrl->hpd_state) {
		@@ -3249,6 +3245,10 @@ static int hdmi_tx_power_on(struct mdss_panel_data *panel_data)
		return rc;
		}
		}

		mutex_lock(&hdmi_ctrl->power_mutex);
		hdmi_ctrl->panel_power_on = true;
		mutex_unlock(&hdmi_ctrl->power_mutex);
		end:
		dss_reg_dump(io->base, io->len, "HDMI-ON: ", REG_DUMP);