]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/vc4: hdmi: Call HDMI hotplug helper on disconnect
authorStefan Wahren <wahrenst@gmx.net>
Mon, 17 Mar 2025 17:12:23 +0000 (17:12 +0000)
committerDave Stevenson <dave.stevenson@raspberrypi.com>
Tue, 25 Mar 2025 18:40:12 +0000 (18:40 +0000)
drm_atomic_helper_connector_hdmi_hotplug() must be called
regardless of the connection status, otherwise the HDMI audio
disconnect event won't be notified.

Fixes: 2ea9ec5d2c20 ("drm/vc4: hdmi: use drm_atomic_helper_connector_hdmi_hotplug()")
Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: David Turner <david.turner@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250317-vc4_hotplug-v4-2-2af625629186@raspberrypi.com
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
drivers/gpu/drm/vc4/vc4_hdmi.c

index 37238a12baa58a06a5d6f40d1ab64abc7fac60d7..37a7d45695f236d3ab281d9a8676921fd434955c 100644 (file)
@@ -372,13 +372,13 @@ static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi,
         * the lock for now.
         */
 
+       drm_atomic_helper_connector_hdmi_hotplug(connector, status);
+
        if (status == connector_status_disconnected) {
                cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
                return;
        }
 
-       drm_atomic_helper_connector_hdmi_hotplug(connector, status);
-
        cec_s_phys_addr(vc4_hdmi->cec_adap,
                        connector->display_info.source_physical_address, false);