]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm: sun4i: hdmi: Fix inverted HPD result
authorChen-Yu Tsai <wens@csie.org>
Sat, 11 Jul 2020 01:10:30 +0000 (09:10 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jul 2020 05:42:53 +0000 (07:42 +0200)
[ Upstream commit baa1841eb797eadce6c907bdaed7cd6f01815404 ]

When the extra HPD polling in sun4i_hdmi was removed, the result of
HPD was accidentally inverted.

Fix this by inverting the check.

Fixes: bda8eaa6dee7 ("drm: sun4i: hdmi: Remove extra HPD polling")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Tested-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200711011030.21997-1-wens@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

index 82cb93935188938ca192a6361483703a1953148f..c9f1a8cd5f2ac29cc45f23be8f887d9a390db530 100644 (file)
@@ -215,7 +215,7 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force)
        unsigned long reg;
 
        reg = readl(hdmi->base + SUN4I_HDMI_HPD_REG);
-       if (reg & SUN4I_HDMI_HPD_HIGH) {
+       if (!(reg & SUN4I_HDMI_HPD_HIGH)) {
                cec_phys_addr_invalidate(hdmi->cec_adap);
                return connector_status_disconnected;
        }