From: Yakir Yang <ykk@rock-chips.com>
To: David Airlie <airlied@linux.ie>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Philipp Zabel <p.zabel@pengutronix.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>,
Shawn Guo <shawn.guo@linaro.org>, Rob Clark <robdclark@gmail.com>,
Mark Yao <mark.yao@rock-chips.com>,
Daniel Vetter <daniel@ffwll.ch>, Yakir Yang <ykk@rock-chips.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
djkurtz@chromium.org, dbehr@chromoum.org, mmind00@googlemail.com,
dianders@chromium.org, marcheu@chromium.org,
rockchip-discuss@chromium.org
Subject: [PATCH v2 06/12] drm: bridge/dw_hdmi: add audio support for more display resolutions
Date: Fri, 30 Jan 2015 06:30:39 -0500 [thread overview]
Message-ID: <1422617439-25564-1-git-send-email-ykk@rock-chips.com> (raw)
In-Reply-To: <1422617031-25098-1-git-send-email-ykk@rock-chips.com>
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@rock-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
next prev parent reply other threads:[~2015-01-30 11:31 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-30 11:23 [PATCH v2 0/12] Those patches is used for dw_hdmi audio support Yakir Yang
2015-01-30 11:25 ` [PATCH v2 01/12] drm: bridge/dw_hdmi: adjust n/cts setting order Yakir Yang
2015-01-31 11:07 ` Russell King - ARM Linux
2015-02-02 13:02 ` Yang Kuankuan
2015-01-30 11:27 ` [PATCH v2 02/12] drm: bridge/dw_hdmi: add audio sample channel status setting Yakir Yang
2015-01-31 11:08 ` Russell King - ARM Linux
2015-01-31 11:22 ` Yang Kuankuan
2015-01-31 11:30 ` Russell King - ARM Linux
2015-01-30 11:28 ` [PATCH v2 03/12] drm: bridge/dw_hdmi: add irq control to suspend/resume Yakir Yang
2015-01-31 11:11 ` Russell King - ARM Linux
2015-01-31 11:18 ` Yang Kuankuan
2015-01-30 11:28 ` [PATCH v2 04/12] drm: rockchip/dw_hdmi_rockchip: add resume/suspend support Yakir Yang
2015-01-31 11:13 ` Russell King - ARM Linux
2015-01-31 12:30 ` Yang Kuankuan
2015-01-30 11:29 ` [PATCH v2 05/12] drm: rockchip/vop: filter interlace display mode Yakir Yang
2015-02-02 8:00 ` Daniel Kurtz
2015-02-02 8:28 ` Yang Kuankuan
2015-01-30 11:30 ` Yakir Yang [this message]
2015-01-31 11:20 ` [PATCH v2 06/12] drm: bridge/dw_hdmi: add audio support for more display resolutions Russell King - ARM Linux
2015-01-31 13:28 ` Yang Kuankuan
2015-01-30 11:31 ` [PATCH v2 07/12] drm: bridge/dw_hdmi: enable audio support for No-CEA " Yakir Yang
2015-01-31 11:41 ` Russell King - ARM Linux
2015-01-30 11:32 ` [PATCH v2 08/12] drm: bridge/dw_hdmi: add audio config interfaces Yakir Yang
2015-01-31 11:48 ` Russell King - ARM Linux
2015-01-31 14:34 ` Yang Kuankuan
2015-02-02 4:02 ` Daniel Kurtz
2015-02-02 11:53 ` Russell King - ARM Linux
2015-02-02 12:32 ` Yang Kuankuan
2015-02-02 13:09 ` Russell King - ARM Linux
2015-02-03 3:05 ` Yang Kuankuan
2015-02-04 3:02 ` Yang Kuankuan
2015-01-30 11:33 ` [PATCH v2 09/12] drm: bridge/dw_hdmi: creat dw-hdmi-audio platform device Yakir Yang
2015-01-30 11:41 ` [PATCH v2 10/12] ASoC: dw-hdmi-audio: add codec driver for dw hdmi audio Yakir Yang
2015-01-31 11:39 ` Russell King - ARM Linux
2015-01-30 11:43 ` [PATCH v2 11/12] ASoC: rockchip-hdmi-audio: add sound driver for " Yakir Yang
2015-01-30 11:44 ` [PATCH v2 12/12] dt-bindings: Add documentation for Rockchip dw-hdmi-audio Yakir Yang
2015-01-31 11:36 ` Russell King - ARM Linux
2015-01-31 13:51 ` Yang Kuankuan
2015-01-31 12:00 ` [PATCH v2 0/12] Those patches is used for dw_hdmi audio support Russell King - ARM Linux
2015-02-02 13:02 ` Yang Kuankuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422617439-25564-1-git-send-email-ykk@rock-chips.com \
--to=ykk@rock-chips.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dbehr@chromoum.org \
--cc=dianders@chromium.org \
--cc=djkurtz@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=fabio.estevam@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcheu@chromium.org \
--cc=mark.yao@rock-chips.com \
--cc=mmind00@googlemail.com \
--cc=p.zabel@pengutronix.de \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=robdclark@gmail.com \
--cc=rockchip-discuss@chromium.org \
--cc=shawn.guo@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®