Commit d840a216 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/hdmi: get rid of hdmi_mode 



Use connector->display_info.is_hdmi instead of manually using
drm_detect_hdmi_monitor().

Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/639657/
Link: https://lore.kernel.org/r/20250226-bridge-hdmi-connector-v8-4-340af24b35cc@linaro.org
parent 384d2b03

drivers/gpu/drm/msm/hdmi/hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ void msm_hdmi_set_mode(struct hdmi *hdmi, bool power_on) 
	spin_lock_irqsave(&hdmi->reg_lock, flags);

	if (power_on) {

		ctrl |= HDMI_CTRL_ENABLE;

		if (!hdmi->hdmi_mode) {

		if (!hdmi->connector->display_info.is_hdmi) {

			ctrl |= HDMI_CTRL_HDMI;

			hdmi_write(hdmi, REG_HDMI_CTRL, ctrl);

			ctrl &= ~HDMI_CTRL_HDMI;

drivers/gpu/drm/msm/hdmi/hdmi.h

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ struct hdmi { 
	/* the encoder we are hooked to (outside of hdmi block) */

	struct drm_encoder *encoder;



	bool hdmi_mode;               /* are we in hdmi mode? */



	int irq;

	struct workqueue_struct *workq;

drivers/gpu/drm/msm/hdmi/hdmi_bridge.c

+3 −14
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static void msm_hdmi_bridge_atomic_pre_enable(struct drm_bridge *bridge, 
		msm_hdmi_phy_resource_enable(phy);

		msm_hdmi_power_on(bridge);

		hdmi->power_on = true;

		if (hdmi->hdmi_mode)

		if (connector->display_info.is_hdmi)

			msm_hdmi_audio_update(hdmi);

	}
@@ -263,7 +263,7 @@ static void msm_hdmi_bridge_atomic_post_disable(struct drm_bridge *bridge, 
	if (hdmi->power_on) {

		power_off(bridge);

		hdmi->power_on = false;

		if (hdmi->hdmi_mode)

		if (hdmi->connector->display_info.is_hdmi)

			msm_hdmi_audio_update(hdmi);

		msm_hdmi_phy_resource_disable(phy);

	}
@@ -319,7 +319,7 @@ static void msm_hdmi_set_timings(struct hdmi *hdmi, 
	DBG("frame_ctrl=%08x", frame_ctrl);

	hdmi_write(hdmi, REG_HDMI_FRAME_CTRL, frame_ctrl);



	if (hdmi->hdmi_mode)

	if (hdmi->connector->display_info.is_hdmi)

		msm_hdmi_audio_update(hdmi);

}
@@ -338,17 +338,6 @@ static const struct drm_edid *msm_hdmi_bridge_edid_read(struct drm_bridge *bridg 


	hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl);



	if (drm_edid) {

		/*

		 * FIXME: This should use connector->display_info.is_hdmi from a

		 * path that has read the EDID and called

		 * drm_edid_connector_update().

		 */

		const struct edid *edid = drm_edid_raw(drm_edid);



		hdmi->hdmi_mode = drm_detect_hdmi_monitor(edid);

	}



	return drm_edid;

}