59 lines
2.1 KiB
Plaintext
59 lines
2.1 KiB
Plaintext
From 87c27a1c822a43d8f6d7bc2bb889be2d3d80a100 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
Date: Sun, 3 Sep 2017 11:32:34 +0200
|
|
Subject: [PATCH 079/146] drm: bridge: Add audio workaround for dw_hdmi v1.32a
|
|
|
|
Allwinner SoCs with dw hdmi v1.32a seems to have an issue with manual
|
|
setting CTS value. BSP driver sets it to auto mode and that works
|
|
here too.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
---
|
|
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 30 +++++++++++++++--------
|
|
1 file changed, 20 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
index 5971976284bf..4b08840749bd 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
@@ -424,16 +424,26 @@ static struct i2c_adapter *dw_hdmi_i2c_adapter(struct dw_hdmi *hdmi)
|
|
static void hdmi_set_cts_n(struct dw_hdmi *hdmi, unsigned int cts,
|
|
unsigned int n)
|
|
{
|
|
- /* Must be set/cleared first */
|
|
- hdmi_modb(hdmi, 0, HDMI_AUD_CTS3_CTS_MANUAL, HDMI_AUD_CTS3);
|
|
-
|
|
- /* nshift factor = 0 */
|
|
- hdmi_modb(hdmi, 0, HDMI_AUD_CTS3_N_SHIFT_MASK, HDMI_AUD_CTS3);
|
|
-
|
|
- hdmi_writeb(hdmi, ((cts >> 16) & HDMI_AUD_CTS3_AUDCTS19_16_MASK) |
|
|
- HDMI_AUD_CTS3_CTS_MANUAL, HDMI_AUD_CTS3);
|
|
- hdmi_writeb(hdmi, (cts >> 8) & 0xff, HDMI_AUD_CTS2);
|
|
- hdmi_writeb(hdmi, cts & 0xff, HDMI_AUD_CTS1);
|
|
+ /*
|
|
+ * Manual CTS setting doesn't work correctly on Allwinner SoCs with
|
|
+ * dw hdmi v1.32a.
|
|
+ */
|
|
+ if (hdmi->version != 0x132a) {
|
|
+ /* Must be set/cleared first */
|
|
+ hdmi_modb(hdmi, 0, HDMI_AUD_CTS3_CTS_MANUAL, HDMI_AUD_CTS3);
|
|
+
|
|
+ /* nshift factor = 0 */
|
|
+ hdmi_modb(hdmi, 0, HDMI_AUD_CTS3_N_SHIFT_MASK, HDMI_AUD_CTS3);
|
|
+
|
|
+ hdmi_writeb(hdmi,
|
|
+ ((cts >> 16) & HDMI_AUD_CTS3_AUDCTS19_16_MASK) |
|
|
+ HDMI_AUD_CTS3_CTS_MANUAL, HDMI_AUD_CTS3);
|
|
+ hdmi_writeb(hdmi, (cts >> 8) & 0xff, HDMI_AUD_CTS2);
|
|
+ hdmi_writeb(hdmi, cts & 0xff, HDMI_AUD_CTS1);
|
|
+ } else {
|
|
+ /* set automatic CTS calculation */
|
|
+ hdmi_writeb(hdmi, 0x00, HDMI_AUD_CTS3);
|
|
+ }
|
|
|
|
hdmi_writeb(hdmi, (n >> 16) & 0x0f, HDMI_AUD_N3);
|
|
hdmi_writeb(hdmi, (n >> 8) & 0xff, HDMI_AUD_N2);
|
|
--
|
|
2.17.1
|
|
|