From: Anssi Hannula <anssi.hannula@iki.fi>
To: Takashi Iwai <tiwai@suse.de>
Cc: "Olivier Langlois" <olivier@trillion01.com>,
alsa-devel@alsa-project.org, "Rafał Miłecki" <zajec5@gmail.com>,
linux-kernel@vger.kernel.org,
"Peter Frühberger" <fritsch@xbmc.org>
Subject: [PATCH 4/4] ALSA: hda - hdmi: Disable ramp-up/down for non-PCM on AMD codecs
Date: Tue, 1 Oct 2013 23:30:56 +0300 [thread overview]
Message-ID: <1380659456-3746-5-git-send-email-anssi.hannula@iki.fi> (raw)
In-Reply-To: <1380659456-3746-1-git-send-email-anssi.hannula@iki.fi>
Recent AMD HDMI codecs (revision ID 3 and later, 0x100300 as reported by
procfs codec#0) have a configurable ramp-up/down functionality.
The documentation ( http://www.x.org/docs/AMD/AMD_HDA_verbs_v2.pdf )
specifies that 180 (meaning 180/256 =~ 0.7) is recommended for PCM and 0
for non-PCM.
Apply the recommended values according to provided S/PDIF AES0 settings.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
---
sound/pci/hda/patch_hdmi.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index c0cd4ca..22f30fe 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2673,6 +2673,10 @@ static int patch_nvhdmi_8ch_7x(struct hda_codec *codec)
#define ATI_VERB_GET_MULTICHANNEL_7 0xf88
#define ATI_VERB_GET_MULTICHANNEL_MODE 0xf89
+/* AMD specific HDA cvt verbs */
+#define ATI_VERB_SET_RAMP_RATE 0x770
+#define ATI_VERB_GET_RAMP_RATE 0xf70
+
#define ATI_OUT_ENABLE 0x1
#define ATI_HBR_CAPABLE 0x01
@@ -2824,6 +2828,7 @@ static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
unsigned int format,
struct snd_pcm_substream *substream)
{
+ hda_nid_t cvt_nid = hinfo->nid;
struct hdmi_spec *spec = codec->spec;
int pin_idx = hinfo_to_pin_index(spec, hinfo);
struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
@@ -2853,6 +2858,15 @@ static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
return -EINVAL;
}
+ if (is_amdhdmi_rev3(codec)) {
+ int ramp_rate = 180; /* default as per spec */
+ /* disable ramp-up/down for non-pcm as per spec */
+ if (format & AC_FMT_TYPE_NON_PCM)
+ ramp_rate = 0;
+
+ snd_hda_codec_write(codec, cvt_nid, 0, ATI_VERB_SET_RAMP_RATE, ramp_rate);
+ }
+
return generic_hdmi_playback_pcm_prepare(hinfo, codec, stream_tag, format, substream);
}
--
1.8.1.5
next prev parent reply other threads:[~2013-10-01 20:31 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-01 20:30 [RFC/RFT v2 0/4] ALSA: hda - hdmi: ATI/AMD multi-channel and HBR support Anssi Hannula
2013-10-01 20:30 ` [PATCH 1/4] ALSA: hda - hdmi: Add ATI/AMD multi-channel audio support Anssi Hannula
2013-10-30 15:35 ` Rafał Miłecki
2013-10-30 15:59 ` Anssi Hannula
2013-10-31 16:22 ` Rafał Miłecki
2013-10-31 20:26 ` Anssi Hannula
2013-10-31 23:25 ` Rafał Miłecki
2013-10-31 23:34 ` Anssi Hannula
2013-10-31 23:51 ` Rafał Miłecki
2013-10-31 23:58 ` Anssi Hannula
2013-11-01 11:29 ` Rafał Miłecki
2013-11-01 12:15 ` Anssi Hannula
2013-11-01 13:22 ` Rafał Miłecki
2013-11-01 13:43 ` Rafał Miłecki
2013-10-01 20:30 ` [PATCH 2/4] ALSA: hda - hdmi: Add ELD emulation for ATI/AMD codecs Anssi Hannula
2013-10-01 20:30 ` [PATCH 3/4] ALSA: hda - hdmi: Add HBR bitstreaming support for ATI/AMD HDMI codecs Anssi Hannula
2013-10-01 20:30 ` Anssi Hannula [this message]
2013-10-02 14:34 ` [RFC/RFT v2 0/4] ALSA: hda - hdmi: ATI/AMD multi-channel and HBR support Takashi Iwai
2013-10-02 16:42 ` Anssi Hannula
2013-10-07 7:33 ` Takashi Iwai
2013-10-04 7:06 ` Olivier Langlois
2013-10-04 23:39 ` Anssi Hannula
2013-10-06 3:48 ` Olivier Langlois
2013-10-06 12:07 ` [alsa-devel] " Anssi Hannula
2013-10-09 4:32 ` Olivier Langlois
2013-10-24 19:06 ` Anssi Hannula
2013-11-07 21:20 ` Olivier Langlois
2013-11-08 10:18 ` Anssi Hannula
2013-11-08 16:44 ` Olivier Langlois
2013-11-08 22:13 ` Anssi Hannula
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=1380659456-3746-5-git-send-email-anssi.hannula@iki.fi \
--to=anssi.hannula@iki.fi \
--cc=alsa-devel@alsa-project.org \
--cc=fritsch@xbmc.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olivier@trillion01.com \
--cc=tiwai@suse.de \
--cc=zajec5@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).