From 3ef02e9a5cbc3c7ab468c9d4cab6de32e1323ba2 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Thu, 22 Oct 2020 19:07:24 +0100 Subject: [PATCH] vc4_hdmi: Move hdmi reset to bind raspberrypi inclusion category: feature bugzilla: 50432 -------------------------------- The hdmi reset got moved to a later point in "drm/vc4: hdmi: Add reset callback" which 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 resgisters are in a separate block Fixes: ed9a1f6eb4402b25b8a983dc4bfe40f025176e03 Signed-off-by: Dom Cobley Signed-off-by: Fang Yafen Signed-off-by: Zheng Zengkai --- drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 81f0cd7f846b..452c4a514bfd 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -986,9 +986,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, mode); @@ -2366,6 +2363,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); -- GitLab