Patch "drm/vc4: hdmi: Move hdmi reset to bind" has been added to the 5.11-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/vc4: hdmi: Move hdmi reset to bind

to the 5.11-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-vc4-hdmi-move-hdmi-reset-to-bind.patch
and it can be found in the queue-5.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit e2d3f143bcaccfc686af6c3d08d1467c0e8613d0
Author: Dom Cobley <popcornmix@xxxxxxxxx>
Date:   Mon Jan 11 15:22:56 2021 +0100

    drm/vc4: hdmi: Move hdmi reset to bind
    
    [ Upstream commit 902dc5c19a8fecd3113dd41cc601b34557bdede9 ]
    
    The hdmi reset got moved to a later point in the commit 9045e91a476b
    ("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: 9045e91a476b ("drm/vc4: hdmi: Add reset callback")
    Reviewed-by: Dave Stevenson <dave.stevenson@xxxxxxxxxxxxxxx>
    Signed-off-by: Dom Cobley <popcornmix@xxxxxxxxx>
    Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx>
    Acked-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
    Tested-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210111142309.193441-3-maxime@xxxxxxxxxx
    (cherry picked from commit 7155334f15f360f5c98391c5c7e12af4c13395c4)
    Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 2013f83ef50b6..ea50ecf985d1c 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -660,9 +660,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);
 
@@ -1743,6 +1740,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);