Commit 1735917a authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/hdmi: move msm_hdmi_audio_update() out of msm_hdmi_set_timings() 



There is a duplication between msm_hdmi_audio_update() calls in
msm_hdmi_set_timings() and msm_hdmi_bridge_atomic_pre_enable(). Merge
those two calls to be performed unconditionally at
msm_hdmi_bridge_atomic_pre_enable().

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/647505/
Link: https://lore.kernel.org/r/20250408-drm-hdmi-acr-v2-2-dee7298ab1af@oss.qualcomm.com
parent 17857517

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

+3 −5
Original line number Diff line number Diff line
@@ -324,9 +324,10 @@ 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 (connector->display_info.is_hdmi)

		msm_hdmi_audio_update(hdmi);

	}



	drm_atomic_helper_connector_hdmi_update_infoframes(connector, state);
@@ -411,9 +412,6 @@ static void msm_hdmi_set_timings(struct hdmi *hdmi, 
		frame_ctrl |= HDMI_FRAME_CTRL_INTERLACED_EN;

	DBG("frame_ctrl=%08x", frame_ctrl);

	hdmi_write(hdmi, REG_HDMI_FRAME_CTRL, frame_ctrl);



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

		msm_hdmi_audio_update(hdmi);

}



static const struct drm_edid *msm_hdmi_bridge_edid_read(struct drm_bridge *bridge,