linux (Rockchip): rebase patches for 6.0.3

This commit is contained in:
Rudi Heitbaum 2022-10-19 11:34:06 +00:00
parent 53503ffc7b
commit dc12ee3d56

View File

@ -3623,14 +3623,14 @@ depending on sink's implementation.
Signed-off-by: Alex Bee <knaerzche@gmail.com> Signed-off-by: Alex Bee <knaerzche@gmail.com>
--- ---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 17 +++++++++-------- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 ++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-) 1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 3082387aa53e..b869e9d3cf93 100644 index 84cc52858ffb..3c20ef3bd3c1 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -3173,18 +3173,11 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) @@ -3036,24 +3036,11 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
* ask the source to re-read the EDID. * ask the source to re-read the EDID.
*/ */
if (intr_stat & if (intr_stat &
@ -3645,12 +3645,18 @@ index 3082387aa53e..b869e9d3cf93 100644
- cec_notifier_phys_addr_invalidate(hdmi->cec_notifier); - cec_notifier_phys_addr_invalidate(hdmi->cec_notifier);
- mutex_unlock(&hdmi->cec_notifier_mutex); - mutex_unlock(&hdmi->cec_notifier_mutex);
- } - }
-
- if (phy_stat & HDMI_PHY_HPD)
- status = connector_status_connected;
-
- if (!(phy_stat & (HDMI_PHY_HPD | HDMI_PHY_RX_SENSE)))
- status = connector_status_disconnected;
- } - }
- -
if (intr_stat & HDMI_IH_PHY_STAT0_HPD) { if (status != connector_status_unknown) {
enum drm_connector_status status = phy_int_pol & HDMI_PHY_HPD dev_dbg(hdmi->dev, "EVENT=%s\n",
? connector_status_connected status == connector_status_connected ?
@@ -3198,6 +3191,14 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) @@ -3061,6 +3054,14 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
drm_helper_hpd_irq_event(hdmi->bridge.dev); drm_helper_hpd_irq_event(hdmi->bridge.dev);
drm_bridge_hpd_notify(&hdmi->bridge, status); drm_bridge_hpd_notify(&hdmi->bridge, status);
} }