Commit 902dc5c1 authored by Dom Cobley's avatar Dom Cobley Committed by Maarten Lankhorst
Browse files

drm/vc4: hdmi: Move hdmi reset to bind 



The hdmi reset got moved to a later point in the commit 9045e91a
("drm/vc4: hdmi: Add reset callback").

However, the reset now occurs after vc4_hdmi_cec_init and so tramples
the setup of registers like HDMI_CEC_CNTRL_1

This only affects pi0-3 as on pi4 the cec registers are in a separate
block

Fixes: 9045e91a ("drm/vc4: hdmi: Add reset callback")
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarDom Cobley <popcornmix@gmail.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Tested-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Link: https://patchwork.freedesktop.org/patch/msgid/20210111142309.193441-3-maxime@cerno.tech


(cherry picked from commit 7155334f)
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 4c3a3292

drivers/gpu/drm/vc4/vc4_hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -779,9 +779,6 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder, 
		return;

	}



	if (vc4_hdmi->variant->reset)

		vc4_hdmi->variant->reset(vc4_hdmi);



	if (vc4_hdmi->variant->phy_init)

		vc4_hdmi->variant->phy_init(vc4_hdmi, vc4_conn_state);
@@ -1875,6 +1872,9 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 
	vc4_hdmi->disable_wifi_frequencies =

		of_property_read_bool(dev->of_node, "wifi-2.4ghz-coexistence");



	if (vc4_hdmi->variant->reset)

		vc4_hdmi->variant->reset(vc4_hdmi);



	pm_runtime_enable(dev);



	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);