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

Commit 31d2cc0e authored by Casey Piper's avatar Casey Piper Committed by Gerrit - the friendly Code Review server
Browse files

msm: mdss: hdmi: return cable status only when HDMI is powered 



When audio driver requests the cable status, return that
the cable status is connected only when HDMI is powered.
This prevents audio from accessing HDMI registers when
HDMI clock is off.

Change-Id: Icc5016df731725de25b4ca86e2ac3632ab89d5bf
Signed-off-by: default avatarCasey Piper <cpiper@codeaurora.org>
parent a28dc2cc

drivers/video/msm/mdss/mdss_hdmi_tx.c

+5 −5
Original line number Diff line number Diff line
@@ -2777,7 +2777,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;
@@ -3226,10 +3226,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) {
@@ -3242,6 +3238,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);