Patch "drm/vc4: hdmi: Restore cec physical address on reconnect" 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: Restore cec physical address on reconnect

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-restore-cec-physical-address-on-reconne.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 f7123c44e61e1a9b45d6fd2027207c56de429e9a
Author: Dom Cobley <popcornmix@xxxxxxxxx>
Date:   Mon Jan 11 15:22:59 2021 +0100

    drm/vc4: hdmi: Restore cec physical address on reconnect
    
    [ Upstream commit 4d8602b8ec16f5721a4d1339c610a81f95df1856 ]
    
    Currently we call cec_phys_addr_invalidate on a hotplug deassert.
    That may be due to a TV power cycling, or an AVR being switched
    on (and switching edid).
    
    This makes CEC unusable since our controller wouldn't have a physical
    address anymore.
    
    Set it back up again on the hotplug assert.
    
    Fixes: 15b4511a4af6 ("drm/vc4: add HDMI CEC support")
    Signed-off-by: Dom Cobley <popcornmix@xxxxxxxxx>
    Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx>
    Acked-by: Dave Stevenson <dave.stevenson@xxxxxxxxxxxxxxx>
    Acked-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
    Tested-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210111142309.193441-6-maxime@xxxxxxxxxx
    (cherry picked from commit b06eecb5158e5f3eb47b9d05aea8c259985cc5f7)
    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 3d473638dbe18..a9a6552bdae93 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -123,20 +123,32 @@ static enum drm_connector_status
 vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
 {
 	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
+	bool connected = false;
 
 	if (vc4_hdmi->hpd_gpio) {
 		if (gpio_get_value_cansleep(vc4_hdmi->hpd_gpio) ^
 		    vc4_hdmi->hpd_active_low)
-			return connector_status_connected;
-		cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
-		return connector_status_disconnected;
+			connected = true;
+	} else if (drm_probe_ddc(vc4_hdmi->ddc)) {
+		connected = true;
+	} else if (HDMI_READ(HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED) {
+		connected = true;
 	}
 
-	if (drm_probe_ddc(vc4_hdmi->ddc))
-		return connector_status_connected;
+	if (connected) {
+		if (connector->status != connector_status_connected) {
+			struct edid *edid = drm_get_edid(connector, vc4_hdmi->ddc);
+
+			if (edid) {
+				cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid);
+				vc4_hdmi->encoder.hdmi_monitor = drm_detect_hdmi_monitor(edid);
+				kfree(edid);
+			}
+		}
 
-	if (HDMI_READ(HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED)
 		return connector_status_connected;
+	}
+
 	cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
 	return connector_status_disconnected;
 }