mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2025-02-19 19:46:15 +00:00
fcdb1299db
In PR 7022 the upstream patch as below was reverted by commit - 53503ffc7b05cc6686ee070413e384a1189a112a. Reintroduce the upstream patch. -- https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c?h=v5.10.150&id=b70f8abc1a440be6802f27631ecb9acb0a158c66 Subject: [PATCH] WIP: drm/bridge: synopsys: Fix CEC not working after power-cyclying This fixes standby -> power-on on Rockchip platform for, at least, RK3288/RK3328/RK3399 where CEC wasn't working after powering on again. It might differ for other phy implementations: The whole HPD-detection part shoud be reworked and we should in general avoid to rely in RX_SENSE phy status (at least for HDMI), since it differs depending on sink's implementation. --
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Fri, 22 Oct 2021 11:17:30 +0200
|
|
Subject: [PATCH] WIP: drm/bridge: synopsys: Fix CEC not working after
|
|
power-cyclying
|
|
|
|
This fixes standby -> power-on on Rockchip platform for, at least,
|
|
RK3288/RK3328/RK3399 where CEC wasn't working after powering on again.
|
|
It might differ for other phy implementations:
|
|
The whole HPD-detection part shoud be reworked and we should in general
|
|
avoid to rely in RX_SENSE phy status (at least for HDMI), since it differs
|
|
depending on sink's implementation.
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
---
|
|
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 14 ++++++++------
|
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
index 92e621f2714f..7551e3ab77d6 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
@@ -3179,12 +3179,6 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
|
|
phy_stat & HDMI_PHY_HPD,
|
|
phy_stat & HDMI_PHY_RX_SENSE);
|
|
|
|
- if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) == 0) {
|
|
- mutex_lock(&hdmi->cec_notifier_mutex);
|
|
- cec_notifier_phys_addr_invalidate(hdmi->cec_notifier);
|
|
- mutex_unlock(&hdmi->cec_notifier_mutex);
|
|
- }
|
|
-
|
|
if (phy_stat & HDMI_PHY_HPD)
|
|
status = connector_status_connected;
|
|
|
|
@@ -3201,6 +3195,14 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
|
|
drm_helper_hpd_irq_event(hdmi->bridge.dev);
|
|
drm_bridge_hpd_notify(&hdmi->bridge, status);
|
|
}
|
|
+
|
|
+ if (status == connector_status_disconnected &&
|
|
+ (phy_stat & HDMI_PHY_RX_SENSE) &&
|
|
+ (phy_int_pol & HDMI_PHY_RX_SENSE)) {
|
|
+ mutex_lock(&hdmi->cec_notifier_mutex);
|
|
+ cec_notifier_phys_addr_invalidate(hdmi->cec_notifier);
|
|
+ mutex_unlock(&hdmi->cec_notifier_mutex);
|
|
+ }
|
|
}
|
|
|
|
hdmi_writeb(hdmi, intr_stat, HDMI_IH_PHY_STAT0);
|