[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1422617439-25564-1-git-send-email-ykk@rock-chips.com>
Date: Fri, 30 Jan 2015 06:30:39 -0500
From: Yakir Yang <ykk@...k-chips.com>
To: David Airlie <airlied@...ux.ie>,
Russell King <rmk+kernel@....linux.org.uk>,
Philipp Zabel <p.zabel@...gutronix.de>
Cc: Fabio Estevam <fabio.estevam@...escale.com>,
Shawn Guo <shawn.guo@...aro.org>,
Rob Clark <robdclark@...il.com>,
Mark Yao <mark.yao@...k-chips.com>,
Daniel Vetter <daniel@...ll.ch>,
Yakir Yang <ykk@...k-chips.com>,
dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org,
djkurtz@...omium.org, dbehr@...omoum.org, mmind00@...glemail.com,
dianders@...omium.org, marcheu@...omium.org,
rockchip-discuss@...omium.org
Subject: [PATCH v2 06/12] drm: bridge/dw_hdmi: add audio support for more display resolutions
Add more n/cts values, in that case we can support audio for more
display resolutions (128 * SampleRate = PixelClock * N / CTS).
Signed-off-by: Yakir Yang <ykk@...k-chips.com>
---
Changes in v2:
- add more n/cts combinations for more display resolutions
drivers/gpu/drm/bridge/dw_hdmi.c | 58 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c
index 13f26af..e07723c 100644
--- a/drivers/gpu/drm/bridge/dw_hdmi.c
+++ b/drivers/gpu/drm/bridge/dw_hdmi.c
@@ -265,8 +265,24 @@ static unsigned int hdmi_compute_n(unsigned int freq, unsigned long pixel_clk,
case 44100:
if (pixel_clk == 25170000)
n = 7007;
+ else if (pixel_clk == 25175000)
+ n = 28224;
+ else if (pixel_clk == 40000000)
+ n = 7056;
+ else if (pixel_clk == 54000000)
+ n = 6272;
+ else if (pixel_clk == 65000000)
+ n = 7056;
else if (pixel_clk == 74170000)
n = 17836;
+ else if (pixel_clk == 74250000)
+ n = 6272;
+ else if (pixel_clk == 83500000)
+ n = 7056;
+ else if (pixel_clk == 106500000)
+ n = 4074;
+ else if (pixel_clk == 108000000)
+ n = 4018;
else if (pixel_clk == 148350000)
n = (ratio == 150) ? 17836 : 8918;
else
@@ -276,10 +292,26 @@ static unsigned int hdmi_compute_n(unsigned int freq, unsigned long pixel_clk,
case 48000:
if (pixel_clk == 25170000)
n = (ratio == 150) ? 9152 : 6864;
+ else if (pixel_clk == 25175000)
+ n = 12288;
else if (pixel_clk == 27020000)
n = (ratio == 150) ? 8192 : 6144;
+ else if (pixel_clk == 40000000)
+ n = 6144;
+ else if (pixel_clk == 54000000)
+ n = 6144;
+ else if (pixel_clk == 65000000)
+ n = 6144;
else if (pixel_clk == 74170000)
n = 11648;
+ else if (pixel_clk == 74250000)
+ n = 6144;
+ else if (pixel_clk == 83500000)
+ n = 6144;
+ else if (pixel_clk == 106500000)
+ n = 6144;
+ else if (pixel_clk == 108000000)
+ n = 6144;
else if (pixel_clk == 148350000)
n = (ratio == 150) ? 11648 : 5824;
else
@@ -327,10 +359,18 @@ static unsigned int hdmi_compute_cts(unsigned int freq, unsigned long pixel_clk,
case 96000:
case 192000:
switch (pixel_clk) {
+ case 25175000:
+ cts = 50350;
+ break;
case 25200000:
case 27000000:
+ case 40000000:
case 54000000:
+ case 65000000:
case 74250000:
+ case 83500000:
+ case 106500000:
+ case 108000000:
case 148500000:
cts = pixel_clk / 1000;
break;
@@ -351,18 +391,36 @@ static unsigned int hdmi_compute_cts(unsigned int freq, unsigned long pixel_clk,
case 88200:
case 176400:
switch (pixel_clk) {
+ case 25175000:
+ cts = 125875;
+ break;
case 25200000:
cts = 28000;
break;
case 27000000:
cts = 30000;
break;
+ case 40000000:
+ cts = 50000;
+ break;
case 54000000:
cts = 60000;
break;
+ case 65000000:
+ cts = 81250;
+ break;
case 74250000:
cts = 82500;
break;
+ case 83500000:
+ cts = 104375;
+ break;
+ case 106500000:
+ cts = 88750;
+ break;
+ case 108000000:
+ cts = 76875;
+ break;
case 148500000:
cts = 165000;
break;
--
2.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists