[RFC 0/4] ASoC: Add HDA HDMI codec driver

[RFC 0/4] ASoC: Add HDA HDMI codec driver

[Vinod Koul]

Yes, this patch series attempts to add yet another HDMI driver to
ASoC. This codec appears as HDA codec over HDA link. Although
the codec reside in display we have a HDA link from audio block
to this codec. The communication to codec is over HDA link

Thanks to i915 component infrastructure, we do not need to worry
about keeping the codec on, this is done by i915 for us.

Based on discussion with Mark here at ELCE and other attempts by
various folks on HDMI, I wanted to show on list the stuff we have
done and discuss and try to see how we converge various attempts

The driver here only supports stereo and doesn't do multichannel
just yet, will add later once we converge here. The support for
using i915 component notification by David will be added later
on.

Question/Comments welcome...

Subhransu S. Prusty (4):
  ASoC: hdac-hdmi: Add hdmi driver
  ASoC: hdac_hdmi: Add PM support for HDMI
  ASoC: hdac_hdmi: Add hdac hdmi dai ops
  ASoC: hdac_hdmi: Setup and start infoframe

 sound/soc/codecs/Kconfig     |   4 +
 sound/soc/codecs/Makefile    |   2 +
 sound/soc/codecs/hdac_hdmi.c | 694 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 700 insertions(+)
 create mode 100644 sound/soc/codecs/hdac_hdmi.c

-- 
2.4.3

[RFC 1/4] ASoC: hdac-hdmi: Add hdmi driver

[Vinod Koul]

From: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>

Register the hdmi driver with hda bus and register dais.

Also parse the widget and initialize identified pin and converter widgets.
Curretnly only one pin and one converter widget are enabled on board. So
create the widgets and route map accordingly.

Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/codecs/Kconfig     |   4 +
 sound/soc/codecs/Makefile    |   2 +
 sound/soc/codecs/hdac_hdmi.c | 342 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 348 insertions(+)
 create mode 100644 sound/soc/codecs/hdac_hdmi.c

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 0c9733ecd17f..48d2884a553a 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -65,6 +65,7 @@ config SND_SOC_ALL_CODECS
 	select SND_SOC_ES8328_I2C if I2C
 	select SND_SOC_GTM601
 	select SND_SOC_ICS43432
+	select SND_SOC_HDAC_HDMI
 	select SND_SOC_ISABELLE if I2C
 	select SND_SOC_JZ4740_CODEC
 	select SND_SOC_LM4857 if I2C
@@ -442,6 +443,9 @@ config SND_SOC_BT_SCO
 config SND_SOC_DMIC
 	tristate
 
+config SND_SOC_HDAC_HDMI
+	tristate
+
 config SND_SOC_HDMI_CODEC
        tristate "HDMI stub CODEC"
 
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 4a32077954ae..1bbde8961ec8 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -58,6 +58,7 @@ snd-soc-es8328-i2c-objs := es8328-i2c.o
 snd-soc-es8328-spi-objs := es8328-spi.o
 snd-soc-gtm601-objs := gtm601.o
 snd-soc-ics43432-objs := ics43432.o
+snd-soc-hdac-hdmi-objs := hdac_hdmi.o
 snd-soc-isabelle-objs := isabelle.o
 snd-soc-jz4740-codec-objs := jz4740.o
 snd-soc-l3-objs := l3.o
@@ -250,6 +251,7 @@ obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o
 obj-$(CONFIG_SND_SOC_ES8328_SPI)+= snd-soc-es8328-spi.o
 obj-$(CONFIG_SND_SOC_GTM601)    += snd-soc-gtm601.o
 obj-$(CONFIG_SND_SOC_ICS43432)	+= snd-soc-ics43432.o
+obj-$(CONFIG_SND_SOC_HDAC_HDMI) += snd-soc-hdac-hdmi.o
 obj-$(CONFIG_SND_SOC_ISABELLE)	+= snd-soc-isabelle.o
 obj-$(CONFIG_SND_SOC_JZ4740_CODEC)	+= snd-soc-jz4740-codec.o
 obj-$(CONFIG_SND_SOC_L3)	+= snd-soc-l3.o
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
new file mode 100644
index 000000000000..7bc572eb3152
--- /dev/null
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -0,0 +1,342 @@
+/*
+ *  hdac_hdmi.c - ASoc HDA-HDMI codec driver for Intel platforms
+ *
+ *  Copyright (C) 2014-2015 Intel Corp
+ *  Author: Samreen Nilofer <samreen.nilofer@intel.com>
+ * 	   Subhransu S. Prusty <subhransu.s.prusty@intel.com>
+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/pm_runtime.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/hdaudio_ext.h>
+#include "../../hda/local.h"
+
+#define PIN_OUT			(AC_PINCTL_OUT_EN)
+#define HDA_MAX_CONNECTIONS     32
+
+struct hdac_hdmi_cvt_params {
+	unsigned int channels_min;
+	unsigned int channels_max;
+	u32 rates;
+	u64 formats;
+	unsigned int maxbps;
+};
+
+struct hdac_hdmi_cvt {
+	hda_nid_t nid;
+	struct hdac_hdmi_cvt_params params;
+};
+
+struct hdac_hdmi_pin {
+	hda_nid_t nid;
+	int num_mux_nids;
+	hda_nid_t mux_nids[HDA_MAX_CONNECTIONS];
+};
+
+struct hdac_hdmi_dai_pin_map {
+	int dai_id;
+	struct hdac_hdmi_pin pin;
+	struct hdac_hdmi_cvt cvt;
+};
+
+struct hdac_hdmi_priv {
+	hda_nid_t pin_nid[3];
+	hda_nid_t cvt_nid[3];
+	struct hdac_hdmi_dai_pin_map dai_map[3];
+};
+
+static int hdac_hdmi_query_cvt_params(struct hdac_device *hdac, struct hdac_hdmi_cvt *cvt)
+{
+	int err;
+
+	/* Only stereo supported as of now */
+	cvt->params.channels_min = cvt->params.channels_max = 2;
+
+	err = snd_hdac_query_supported_pcm(hdac, cvt->nid,
+			&cvt->params.rates,
+			&cvt->params.formats,
+			&cvt->params.maxbps);
+	if (err < 0)
+		dev_err(&hdac->dev, "Failed to query pcm params for nid: %d\n", cvt->nid);
+
+	return err;
+}
+
+static int hdac_hdmi_query_pin_connlist(struct hdac_ext_device *hdac,
+		struct hdac_hdmi_pin *pin)
+{
+	if (!(get_wcaps(&hdac->hdac, pin->nid) & AC_WCAP_CONN_LIST)) {
+		dev_warn(&hdac->hdac.dev,
+			   "HDMI: pin %d wcaps %#x "
+			   "does not support connection list\n",
+			   pin->nid, get_wcaps(&hdac->hdac, pin->nid));
+		return -EINVAL;
+	}
+
+	pin->num_mux_nids = snd_hdac_get_connections(&hdac->hdac, pin->nid,
+			pin->mux_nids, HDA_MAX_CONNECTIONS);
+	if (pin->num_mux_nids == 0) {
+		dev_err(&hdac->hdac.dev, "No connnections found\n");
+		return -ENODEV;
+	}
+
+	dev_dbg(&hdac->hdac.dev, "num_mux_nids %d for pin %d\n", pin->num_mux_nids, pin->nid);
+
+	return pin->num_mux_nids;
+}
+
+static void hdac_hdmi_fill_widget_info(struct snd_soc_dapm_widget *w,
+		enum snd_soc_dapm_type id, const char *wname, const char *stream)
+{
+	w->id = id;
+	w->name = wname;
+	w->sname = stream;
+	w->reg = SND_SOC_NOPM;
+	w->shift = 0;
+	w->kcontrol_news = NULL;
+	w->num_kcontrols = 0;
+	w->priv = NULL;
+}
+
+static void hdac_hdmi_fill_route(struct snd_soc_dapm_route *route,
+		const char *sink, const char *control, const char *src)
+{
+	route->sink = sink;
+	route->source = src;
+	route->control = control;
+	route->connected = NULL;
+}
+
+static void create_fill_widget_route_map(struct snd_soc_dapm_context *dapm,
+		struct hdac_hdmi_dai_pin_map *dai_map)
+{
+	struct snd_soc_dapm_route route[1] = {{0}};
+	struct snd_soc_dapm_widget widgets[2] = {{0}};
+
+	hdac_hdmi_fill_widget_info(&widgets[0], snd_soc_dapm_output, "hif1 Output", NULL);
+	hdac_hdmi_fill_widget_info(&widgets[1], snd_soc_dapm_aif_in, "Coverter 1", "hif1");
+
+	hdac_hdmi_fill_route(&route[0], "hif1 Output", NULL, "Coverter 1");
+
+	snd_soc_dapm_new_controls(dapm, widgets, ARRAY_SIZE(widgets));
+	snd_soc_dapm_add_routes(dapm, route, ARRAY_SIZE(route));
+}
+
+static int hdac_hdmi_init_dai_map(struct hdac_ext_device *edev,
+		struct hdac_hdmi_dai_pin_map *dai_map,
+		hda_nid_t pin_nid, hda_nid_t cvt_nid, int dai_id)
+{
+	int ret;
+
+	dai_map->dai_id = dai_id;
+	dai_map->pin.nid = pin_nid;
+
+	ret = hdac_hdmi_query_pin_connlist(edev, &dai_map->pin);
+	if (ret < 0) {
+		dev_err(&edev->hdac.dev, "Error querying connection list: %d\n",
+				ret);
+		return ret;
+	}
+
+	dai_map->cvt.nid = cvt_nid;
+
+	/* Enable out path for this pin widget */
+	snd_hdac_codec_write(&edev->hdac, pin_nid, 0,
+			AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+
+	/* Enable transmission */
+	snd_hdac_codec_write(&edev->hdac, cvt_nid, 0,
+			AC_VERB_SET_DIGI_CONVERT_1, 1);
+
+	/* Category Code (CC) to zero */
+	snd_hdac_codec_write(&edev->hdac, cvt_nid, 0,
+			AC_VERB_SET_DIGI_CONVERT_2, 0);
+
+	snd_hdac_codec_write(&edev->hdac, pin_nid, 0, AC_VERB_SET_CONNECT_SEL, 0);
+
+	return hdac_hdmi_query_cvt_params(&edev->hdac, &dai_map->cvt);
+}
+
+/*
+ * Parse all nodes and store the cvt/pin nids in array
+ * Add one time initialization for pin and cvt widgets
+ */
+static int hdac_hdmi_parse_and_map_nid(struct hdac_ext_device *edev)
+{
+	hda_nid_t nid;
+	int i;
+	struct hdac_device *hdac = &edev->hdac;
+	struct hdac_hdmi_priv *hdmi = edev->private_data;
+	int cvt_nid = 0, pin_nid = 0;
+
+	hdac->num_nodes = snd_hdac_get_sub_nodes(hdac, hdac->afg, &nid);
+	if (!nid || hdac->num_nodes < 0) {
+		dev_warn(&hdac->dev, "HDMI: failed to get afg sub nodes\n");
+		return -EINVAL;
+	}
+
+	hdac->start_nid = nid;
+
+	dev_dbg(&hdac->dev, "Number of nodes %d\n", hdac->num_nodes);
+
+	for (i = 0; i < hdac->num_nodes; i++, nid++) {
+		unsigned int caps;
+		unsigned int type;
+
+		caps = get_wcaps(hdac, nid);
+		type = get_wcaps_type(caps);
+
+		dev_dbg(&hdac->dev, "nid: %d type: %d\n", nid, type);
+
+		if (!(caps & AC_WCAP_DIGITAL))
+			continue;
+
+		switch (type) {
+
+		case AC_WID_AUD_OUT:
+			hdmi->cvt_nid[cvt_nid] = nid;
+			cvt_nid++;
+			break;
+
+		case AC_WID_PIN:
+			hdmi->pin_nid[pin_nid] = nid;
+			pin_nid++;
+			break;
+		}
+	}
+
+	hdac->end_nid = nid;
+
+	dev_dbg(&hdac->dev, "Number of pin nid: %d cvt nid: %d\n", pin_nid, cvt_nid);
+
+	if (!pin_nid || !cvt_nid)
+		return -EIO;
+
+	/*
+	 * Currently on board only 1 pin and 1 converter enabled.
+	 * So using fixed map for dai_id:pin:cvt
+	 */
+	return hdac_hdmi_init_dai_map(edev, &hdmi->dai_map[0], hdmi->pin_nid[0],
+			hdmi->cvt_nid[0], 0);
+}
+
+static int hdmi_codec_probe(struct snd_soc_codec *codec)
+{
+	struct hdac_ext_device *edev = snd_soc_codec_get_drvdata(codec);
+	struct hdac_hdmi_priv *hdmi = edev->private_data;
+	struct snd_soc_dapm_context *dapm =
+		snd_soc_component_get_dapm(&codec->component);
+
+	edev->scodec = codec;
+
+	create_fill_widget_route_map(dapm, &hdmi->dai_map[0]);
+
+	/* Imp: Store the card pointer in hda_codec */
+	edev->card = dapm->card->snd_card;
+
+	return 0;
+}
+
+static struct snd_soc_codec_driver hdmi_hda_codec = {
+	.probe		= hdmi_codec_probe,
+	.idle_bias_off	= true,
+};
+
+static struct snd_soc_dai_driver hdmi_dais[] = {
+	{	.name = "intel-hdmi-hif1",
+		.playback = {
+			.stream_name = "hif1",
+			.channels_min = 2,
+			.channels_max = 2,
+			.rates = SNDRV_PCM_RATE_32000 |
+				SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
+				SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
+				SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,
+			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |
+				SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+
+		},
+	},
+};
+
+static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev)
+{
+	struct hdac_device *codec = &edev->hdac;
+	struct hdac_hdmi_priv *hdmi_priv;
+	int ret = 0;
+
+	dev_dbg(&codec->dev, "%s vendor_id:rev_id %x:%x\n", __func__,
+			codec->vendor_id, codec->revision_id);
+
+	hdmi_priv = devm_kzalloc(&codec->dev, sizeof(*hdmi_priv), GFP_KERNEL);
+	if (NULL == hdmi_priv)
+		return -ENOMEM;
+
+	edev->private_data = hdmi_priv;
+
+	dev_set_drvdata(&codec->dev, edev);
+
+	ret = hdac_hdmi_parse_and_map_nid(edev);
+	if (ret < 0)
+		return ret;
+
+	/* ASoC specific initialization */
+	return snd_soc_register_codec(&codec->dev, &hdmi_hda_codec,
+			hdmi_dais, ARRAY_SIZE(hdmi_dais));
+}
+
+static int hdac_hdmi_dev_remove(struct hdac_ext_device *edev)
+{
+	snd_soc_unregister_codec(&edev->hdac.dev);
+
+	return 0;
+}
+
+static const struct hda_device_id hdmi_list[] = {
+	{ .vendor_id =  0x80862809, .rev_id = 0x100000, .name = "Skylake HDMI", 0 },
+	{},
+};
+
+static struct hdac_ext_driver hdmi_driver = {
+	. hdac = {
+		.driver = {
+			.name   = "HDMI HDA Codec",
+		},
+		.id_table       = hdmi_list,
+	},
+	.probe          = hdac_hdmi_dev_probe,
+	.remove         = hdac_hdmi_dev_remove,
+};
+
+int __init hdmi_init(void)
+{
+	return snd_hda_ext_driver_register(&hdmi_driver);
+}
+
+void __exit hdmi_exit(void)
+{
+	snd_hda_ext_driver_unregister(&hdmi_driver);
+}
+
+module_init(hdmi_init);
+module_exit(hdmi_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("HDMI HD codec");
+MODULE_AUTHOR("Samreen Nilofer<samreen.nilofer@intel.com>");
+MODULE_AUTHOR("Subhransu S. Prusty<subhransu.s.prusty@intel.com>");
-- 
2.4.3

[RFC 2/4] ASoC: hdac_hdmi: Add PM support for HDMI

[Vinod Koul]

From: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>

Power up/down the AFG node during runtime resume/suspend.

Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/codecs/hdac_hdmi.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 7bc572eb3152..de80f774e962 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -60,6 +60,12 @@ struct hdac_hdmi_priv {
 	struct hdac_hdmi_dai_pin_map dai_map[3];
 };
 
+static inline struct hdac_ext_device *to_hda_ext_device(struct device *dev)
+{
+	struct hdac_device *hdac = container_of(dev, struct hdac_device, dev);
+	return container_of(hdac, struct hdac_ext_device, hdac);
+}
+
 static int hdac_hdmi_query_cvt_params(struct hdac_device *hdac, struct hdac_hdmi_cvt *cvt)
 {
 	int err;
@@ -249,11 +255,28 @@ static int hdmi_codec_probe(struct snd_soc_codec *codec)
 	/* Imp: Store the card pointer in hda_codec */
 	edev->card = dapm->card->snd_card;
 
+	/*
+	 * hdac_device core already sets the state to active and calls
+	 * get_noresume. So enable runtime and set the device to suspend.
+	 */
+	pm_runtime_enable(&edev->hdac.dev);
+	pm_runtime_put(&edev->hdac.dev);
+	pm_runtime_suspend(&edev->hdac.dev);
+
+	return 0;
+}
+
+static int hdmi_codec_remove(struct snd_soc_codec *codec)
+{
+	struct hdac_ext_device *edev = snd_soc_codec_get_drvdata(codec);
+
+	pm_runtime_disable(&edev->hdac.dev);
 	return 0;
 }
 
 static struct snd_soc_codec_driver hdmi_hda_codec = {
 	.probe		= hdmi_codec_probe,
+	.remove		= hdmi_codec_remove,
 	.idle_bias_off	= true,
 };
 
@@ -307,6 +330,45 @@ static int hdac_hdmi_dev_remove(struct hdac_ext_device *edev)
 	return 0;
 }
 
+#ifdef CONFIG_PM
+static int hdac_hdmi_runtime_suspend(struct device *dev)
+{
+	struct hdac_ext_device *edev = to_hda_ext_device(dev);
+	struct hdac_device *hdac = &edev->hdac;
+
+	dev_dbg(dev, "Enter: %s\n", __func__);
+
+	/* Power down afg */
+	if (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D3))
+		snd_hdac_codec_write(hdac, hdac->afg, 0,
+			AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+
+	return 0;
+}
+
+static int hdac_hdmi_runtime_resume(struct device *dev)
+{
+	struct hdac_ext_device *edev = to_hda_ext_device(dev);
+	struct hdac_device *hdac = &edev->hdac;
+
+	dev_dbg(dev, "Enter: %s\n", __func__);
+
+	/* Power up afg */
+	if (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D0))
+		snd_hdac_codec_write(hdac, hdac->afg, 0,
+			AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+
+	return 0;
+}
+#else
+#define hdac_hdmi_runtime_suspend NULL
+#define hdac_hdmi_runtime_resume NULL
+#endif
+
+static const struct dev_pm_ops hdac_hdmi_pm = {
+	SET_RUNTIME_PM_OPS(hdac_hdmi_runtime_suspend, hdac_hdmi_runtime_resume, NULL)
+};
+
 static const struct hda_device_id hdmi_list[] = {
 	{ .vendor_id =  0x80862809, .rev_id = 0x100000, .name = "Skylake HDMI", 0 },
 	{},
@@ -316,6 +378,7 @@ static struct hdac_ext_driver hdmi_driver = {
 	. hdac = {
 		.driver = {
 			.name   = "HDMI HDA Codec",
+			.pm = &hdac_hdmi_pm,
 		},
 		.id_table       = hdmi_list,
 	},
-- 
2.4.3

[RFC 3/4] ASoC: hdac_hdmi: Add hdac hdmi dai ops

[Vinod Koul]

From: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>

Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/codecs/hdac_hdmi.c | 156 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)

diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index de80f774e962..309d84122c72 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -26,7 +26,10 @@
 #include <sound/hdaudio_ext.h>
 #include "../../hda/local.h"
 
+#define AMP_OUT_MUTE		0xb080
+#define AMP_OUT_UNMUTE		0xb000
 #define PIN_OUT			(AC_PINCTL_OUT_EN)
+
 #define HDA_MAX_CONNECTIONS     32
 
 struct hdac_hdmi_cvt_params {
@@ -66,6 +69,150 @@ static inline struct hdac_ext_device *to_hda_ext_device(struct device *dev)
 	return container_of(hdac, struct hdac_ext_device, hdac);
 }
 
+static int hdac_hdmi_setup_stream(struct hdac_ext_device *hdac, hda_nid_t cvt_nid,
+			      hda_nid_t pin_nid, u32 stream_tag, int format)
+{
+	unsigned int val;
+
+	dev_dbg(&hdac->hdac.dev, "cvt nid %d pnid %d stream %d format 0x%x\n",
+			cvt_nid, pin_nid, stream_tag, format);
+
+	val = (stream_tag << 4);
+
+	snd_hdac_codec_write(&hdac->hdac, cvt_nid, 0, AC_VERB_SET_CHANNEL_STREAMID, val);
+	snd_hdac_codec_write(&hdac->hdac, cvt_nid, 0,  AC_VERB_SET_STREAM_FORMAT, format);
+
+	return 0;
+}
+
+static void hdac_hdmi_set_power_state(struct hdac_ext_device *edev,
+		struct hdac_hdmi_dai_pin_map *dai_map, unsigned int pwr_state)
+{
+	/* Power up pin widget */
+	if (!snd_hdac_check_power_state(&edev->hdac, dai_map->pin.nid, pwr_state))
+		snd_hdac_codec_write(&edev->hdac, dai_map->pin.nid, 0,
+			AC_VERB_SET_POWER_STATE, pwr_state);
+
+	/* Power up converter */
+	if (!snd_hdac_check_power_state(&edev->hdac, dai_map->cvt.nid, pwr_state))
+		snd_hdac_codec_write(&edev->hdac, dai_map->cvt.nid, 0,
+			AC_VERB_SET_POWER_STATE, pwr_state);
+}
+
+static int hdac_hdmi_playback_prepare(struct snd_pcm_substream *substream,
+				struct snd_soc_dai *dai)
+{
+	struct hdac_ext_device *hdac = snd_soc_dai_get_drvdata(dai);
+	struct hdac_hdmi_priv *hdmi = hdac->private_data;
+	struct hdac_hdmi_dai_pin_map *dai_map;
+	struct hdac_ext_dma_params *dd;
+
+	if (dai->id > 0) {
+		dev_err(&hdac->hdac.dev, "Only one dai supported as of now\n");
+		return -ENODEV;
+	}
+
+	dai_map = &hdmi->dai_map[dai->id];
+
+	dd = (struct hdac_ext_dma_params*)snd_soc_dai_get_dma_data(dai, substream);
+	dev_dbg(&hdac->hdac.dev, "stream tag from cpu dai %d format in cvt 0x%x\n",
+			dd->stream_tag,	dd->format);
+
+	return hdac_hdmi_setup_stream(hdac, dai_map->cvt.nid, dai_map->pin.nid,
+					dd->stream_tag, dd->format);
+}
+
+static int hdac_hdmi_set_hw_params(struct snd_pcm_substream *substream,
+	struct snd_pcm_hw_params *hparams, struct snd_soc_dai *dai)
+{
+	struct hdac_ext_device *hdac = snd_soc_dai_get_drvdata(dai);
+	struct hdac_ext_dma_params *dd;
+
+	if (dai->id > 0) {
+		dev_err(&hdac->hdac.dev, "Only one dai supported as of now\n");
+		return -ENODEV;
+	}
+
+	dd = kzalloc(sizeof(*dd), GFP_KERNEL);
+	dd->format = snd_hdac_calc_stream_format(params_rate(hparams),
+			params_channels(hparams), params_format(hparams),
+			24, 0);
+
+	snd_soc_dai_set_dma_data(dai, substream, (void *)dd);
+
+	return 0;
+}
+
+static int hdac_hdmi_playback_cleanup(struct snd_pcm_substream *substream,
+		struct snd_soc_dai *dai)
+{
+	struct hdac_ext_device *edev = snd_soc_dai_get_drvdata(dai);
+	struct hdac_ext_dma_params *dd;
+	struct hdac_hdmi_priv *hdmi = edev->private_data;
+	struct hdac_hdmi_dai_pin_map *dai_map;
+
+	dai_map = &hdmi->dai_map[dai->id];
+
+	snd_hdac_codec_write(&edev->hdac, dai_map->cvt.nid, 0, AC_VERB_SET_CHANNEL_STREAMID, 0);
+	snd_hdac_codec_write(&edev->hdac, dai_map->cvt.nid, 0,  AC_VERB_SET_STREAM_FORMAT, 0);
+
+	dd = (struct hdac_ext_dma_params*)snd_soc_dai_get_dma_data(dai, substream);
+	snd_soc_dai_set_dma_data(dai, substream, NULL);
+
+	kfree(dd);
+
+	return 0;
+}
+
+static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream,
+			struct snd_soc_dai *dai)
+{
+	struct hdac_ext_device *hdac = snd_soc_dai_get_drvdata(dai);
+	struct hdac_hdmi_priv *hdmi = hdac->private_data;
+	struct hdac_hdmi_dai_pin_map *dai_map;
+	int val;
+
+	if (dai->id > 0) {
+		dev_err(&hdac->hdac.dev, "Only one dai supported as of now\n");
+		return -ENODEV;
+	}
+
+	dai_map = &hdmi->dai_map[dai->id];
+
+	val = snd_hdac_codec_read(&hdac->hdac, dai_map->pin.nid, 0, AC_VERB_GET_PIN_SENSE, 0);
+	dev_info(&hdac->hdac.dev, "Val for AC_VERB_GET_PIN_SENSE: %x\n", val);
+
+	if ((!(val & AC_PINSENSE_PRESENCE)) || (!(val & AC_PINSENSE_ELDV))) {
+		dev_err(&hdac->hdac.dev, "Monitor presence invalid with val: %x\n", val);
+		return -ENODEV;
+	}
+
+	hdac_hdmi_set_power_state(hdac, dai_map, AC_PWRST_D0);
+
+	snd_hdac_codec_write(&hdac->hdac, dai_map->pin.nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+			AMP_OUT_UNMUTE);
+
+	snd_pcm_hw_constraint_step(substream->runtime, 0,
+				   SNDRV_PCM_HW_PARAM_CHANNELS, 2);
+
+	return 0;
+}
+
+static void hdac_hdmi_pcm_close(struct snd_pcm_substream *substream,
+		struct snd_soc_dai *dai)
+{
+	struct hdac_ext_device *hdac = snd_soc_dai_get_drvdata(dai);
+	struct hdac_hdmi_priv *hdmi = hdac->private_data;
+	struct hdac_hdmi_dai_pin_map *dai_map;
+
+	dai_map = &hdmi->dai_map[dai->id];
+
+	hdac_hdmi_set_power_state(hdac, dai_map, AC_PWRST_D3);
+
+	snd_hdac_codec_write(&hdac->hdac, dai_map->pin.nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+			AMP_OUT_MUTE);
+}
+
 static int hdac_hdmi_query_cvt_params(struct hdac_device *hdac, struct hdac_hdmi_cvt *cvt)
 {
 	int err;
@@ -280,6 +427,14 @@ static struct snd_soc_codec_driver hdmi_hda_codec = {
 	.idle_bias_off	= true,
 };
 
+static struct snd_soc_dai_ops hdmi_dai_ops = {
+	.startup = hdac_hdmi_pcm_open,
+	.shutdown = hdac_hdmi_pcm_close,
+	.hw_params = hdac_hdmi_set_hw_params,
+	.prepare = hdac_hdmi_playback_prepare,
+	.hw_free = hdac_hdmi_playback_cleanup,
+};
+
 static struct snd_soc_dai_driver hdmi_dais[] = {
 	{	.name = "intel-hdmi-hif1",
 		.playback = {
@@ -294,6 +449,7 @@ static struct snd_soc_dai_driver hdmi_dais[] = {
 				SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
 
 		},
+		.ops = &hdmi_dai_ops,
 	},
 };
 
-- 
2.4.3

[RFC 4/4] ASoC: hdac_hdmi: Setup and start infoframe

[Vinod Koul]

From: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>

Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/codecs/hdac_hdmi.c | 133 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 309d84122c72..2aca9ce6f423 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -63,6 +63,39 @@ struct hdac_hdmi_priv {
 	struct hdac_hdmi_dai_pin_map dai_map[3];
 };
 
+struct hdmi_audio_infoframe {
+	u8 type; /* 0x84 */
+	u8 ver;  /* 0x01 */
+	u8 len;  /* 0x0a */
+
+	u8 checksum;
+
+	u8 CC02_CT47;	/* CC in bits 0:2, CT in 4:7 */
+	u8 SS01_SF24;
+	u8 CXT04;
+	u8 CA;
+	u8 LFEPBL01_LSV36_DM_INH7;
+};
+
+struct dp_audio_infoframe {
+	u8 type; /* 0x84 */
+	u8 len;  /* 0x1b */
+	u8 ver;  /* 0x11 << 2 */
+
+	u8 CC02_CT47;	/* match with HDMI infoframe from this on */
+	u8 SS01_SF24;
+	u8 CXT04;
+	u8 CA;
+	u8 LFEPBL01_LSV36_DM_INH7;
+};
+
+union audio_infoframe {
+	struct hdmi_audio_infoframe hdmi;
+	struct dp_audio_infoframe dp;
+	u8 bytes[0];
+};
+
+
 static inline struct hdac_ext_device *to_hda_ext_device(struct device *dev)
 {
 	struct hdac_device *hdac = container_of(dev, struct hdac_device, dev);
@@ -85,6 +118,104 @@ static int hdac_hdmi_setup_stream(struct hdac_ext_device *hdac, hda_nid_t cvt_ni
 	return 0;
 }
 
+static void hdac_hdmi_set_dip_index(struct hdac_ext_device *hdac, hda_nid_t pin_nid,
+				int packet_index, int byte_index)
+{
+	int val;
+
+	val = (packet_index << 5) | (byte_index & 0x1f);
+
+	snd_hdac_codec_write(&hdac->hdac, pin_nid, 0, AC_VERB_SET_HDMI_DIP_INDEX, val);
+}
+
+static void hdac_hdmi_write_dip_byte(struct hdac_ext_device *hdac, hda_nid_t pin_nid,
+				unsigned char val)
+{
+	snd_hdac_codec_write(&hdac->hdac, pin_nid, 0, AC_VERB_SET_HDMI_DIP_DATA, val);
+}
+
+static void hdac_hdmi_checksum_audio_infoframe(struct hdmi_audio_infoframe *hdmi_ai)
+{
+	u8 *bytes = (u8 *)hdmi_ai;
+	u8 sum = 0;
+	int i;
+
+	hdmi_ai->checksum = 0;
+
+	for (i = 0; i < sizeof(*hdmi_ai); i++)
+		sum += bytes[i];
+
+	hdmi_ai->checksum = -sum;
+}
+
+static void hdac_hdmi_fill_audio_infoframe(struct hdac_ext_device *hdac,
+				      hda_nid_t pin_nid,
+				      u8 *dip, int size)
+{
+	int i;
+
+	hdac_hdmi_set_dip_index(hdac, pin_nid, 0x0, 0x0);
+	for (i = 0; i < size; i++)
+		hdac_hdmi_write_dip_byte(hdac, pin_nid, dip[i]);
+}
+
+/*
+ * Enable Audio InfoFrame Transmission
+ */
+static void hdac_hdmi_start_infoframe_trans(struct hdac_ext_device *hdac,
+				       hda_nid_t pin_nid)
+{
+	hdac_hdmi_set_dip_index(hdac, pin_nid, 0x0, 0x0);
+	snd_hdac_codec_write(&hdac->hdac, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,
+						AC_DIPXMIT_BEST);
+}
+
+/*
+ * Disable Audio InfoFrame Transmission
+ */
+static void hdac_hdmi_stop_infoframe_trans(struct hdac_ext_device *hdac,
+				      hda_nid_t pin_nid)
+{
+	hdac_hdmi_set_dip_index(hdac, pin_nid, 0x0, 0x0);
+	snd_hdac_codec_write(&hdac->hdac, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,
+						AC_DIPXMIT_DISABLE);
+}
+
+static void hdac_hdmi_setup_audio_infoframe(struct hdac_ext_device *hdac,
+		hda_nid_t cvt_nid, hda_nid_t pin_nid)
+{
+	union audio_infoframe ai;
+	int ca = 0;	/* Default stereo for now */
+	int channels = 2;
+	struct hdmi_audio_infoframe *hdmi_ai = &ai.hdmi;
+
+	/* setup channel count */
+	snd_hdac_codec_write(&hdac->hdac, cvt_nid, 0,
+			    AC_VERB_SET_CVT_CHAN_COUNT, channels - 1);
+
+	/* Set up infoframe */
+	memset(&ai, 0, sizeof(ai));
+
+	/* Only HDMI for now */
+	hdmi_ai->type		= 0x84;
+	hdmi_ai->ver		= 0x01;
+	hdmi_ai->len		= 0x0a;
+	hdmi_ai->CC02_CT47	= channels - 1;
+	hdmi_ai->CA		= ca;
+	hdac_hdmi_checksum_audio_infoframe(hdmi_ai);
+
+	/*
+	 * sizeof(ai) is used instead of sizeof(*hdmi_ai) or
+	 * sizeof(*dp_ai) to avoid partial match/update problems when
+	 * the user switches between HDMI/DP monitors.
+	 */
+	dev_dbg(&hdac->hdac.dev, "hdmi_pin_setup_infoframe: pin=%d channels=%d ca=0x%02x\n",
+			    pin_nid, channels, ca);
+	hdac_hdmi_stop_infoframe_trans(hdac, pin_nid);
+	hdac_hdmi_fill_audio_infoframe(hdac, pin_nid, ai.bytes, sizeof(ai));
+	hdac_hdmi_start_infoframe_trans(hdac, pin_nid);
+}
+
 static void hdac_hdmi_set_power_state(struct hdac_ext_device *edev,
 		struct hdac_hdmi_dai_pin_map *dai_map, unsigned int pwr_state)
 {
@@ -118,6 +249,8 @@ static int hdac_hdmi_playback_prepare(struct snd_pcm_substream *substream,
 	dev_dbg(&hdac->hdac.dev, "stream tag from cpu dai %d format in cvt 0x%x\n",
 			dd->stream_tag,	dd->format);
 
+	hdac_hdmi_setup_audio_infoframe(hdac, dai_map->cvt.nid, dai_map->pin.nid);
+
 	return hdac_hdmi_setup_stream(hdac, dai_map->cvt.nid, dai_map->pin.nid,
 					dd->stream_tag, dd->format);
 }
-- 
2.4.3

Re: [RFC 4/4] ASoC: hdac_hdmi: Setup and start infoframe

[Russell King - ARM Linux]

On Fri, Oct 09, 2015 at 01:28:49PM +0100, Vinod Koul wrote:
> From: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>
> 
> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> ---
>  sound/soc/codecs/hdac_hdmi.c | 133 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 133 insertions(+)
> 
> diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
> index 309d84122c72..2aca9ce6f423 100644
> --- a/sound/soc/codecs/hdac_hdmi.c
> +++ b/sound/soc/codecs/hdac_hdmi.c
> @@ -63,6 +63,39 @@ struct hdac_hdmi_priv {
>  	struct hdac_hdmi_dai_pin_map dai_map[3];
>  };
>  
> +struct hdmi_audio_infoframe {
> +	u8 type; /* 0x84 */
> +	u8 ver;  /* 0x01 */
> +	u8 len;  /* 0x0a */
> +
> +	u8 checksum;
> +
> +	u8 CC02_CT47;	/* CC in bits 0:2, CT in 4:7 */
> +	u8 SS01_SF24;
> +	u8 CXT04;
> +	u8 CA;
> +	u8 LFEPBL01_LSV36_DM_INH7;
> +};

Any reason not to use the infrastructure in drivers/video/hdmi.c for
generating the HDMI infoframes?  I know this is a fairly simple driver
but I'd guess this is going to become more featureful when you move
to supporting multichannel audio.

-- 
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

Re: [RFC 4/4] ASoC: hdac_hdmi: Setup and start infoframe

[Vinod Koul]

On Fri, Oct 09, 2015 at 01:49:29PM +0100, Russell King - ARM Linux wrote:
> On Fri, Oct 09, 2015 at 01:28:49PM +0100, Vinod Koul wrote:
> > From: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>
> > 
> > Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
> > Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> > ---
> >  sound/soc/codecs/hdac_hdmi.c | 133 +++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 133 insertions(+)
> > 
> > diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
> > index 309d84122c72..2aca9ce6f423 100644
> > --- a/sound/soc/codecs/hdac_hdmi.c
> > +++ b/sound/soc/codecs/hdac_hdmi.c
> > @@ -63,6 +63,39 @@ struct hdac_hdmi_priv {
> >  	struct hdac_hdmi_dai_pin_map dai_map[3];
> >  };
> >  
> > +struct hdmi_audio_infoframe {
> > +	u8 type; /* 0x84 */
> > +	u8 ver;  /* 0x01 */
> > +	u8 len;  /* 0x0a */
> > +
> > +	u8 checksum;
> > +
> > +	u8 CC02_CT47;	/* CC in bits 0:2, CT in 4:7 */
> > +	u8 SS01_SF24;
> > +	u8 CXT04;
> > +	u8 CA;
> > +	u8 LFEPBL01_LSV36_DM_INH7;
> > +};
> 
> Any reason not to use the infrastructure in drivers/video/hdmi.c for
> generating the HDMI infoframes?  I know this is a fairly simple driver
> but I'd guess this is going to become more featureful when you move
> to supporting multichannel audio.

Only reason that we didn't look and we should have.
Mark did tell me about it yesterday, but I wanted to get the discussion
kicked off on ML before catching the plane, so posted without looking :)

I did look at these now and yes looks like we don't need these, so I will
drop this now and use it.

This actually helps me to implment multi-channel faster, thanks

-- 
~Vinod

Re: [RFC 0/4] ASoC: Add HDA HDMI codec driver

[Russell King - ARM Linux]

On Fri, Oct 09, 2015 at 01:28:45PM +0100, Vinod Koul wrote:
> Yes, this patch series attempts to add yet another HDMI driver to
> ASoC. This codec appears as HDA codec over HDA link. Although
> the codec reside in display we have a HDA link from audio block
> to this codec. The communication to codec is over HDA link
> 
> Thanks to i915 component infrastructure, we do not need to worry
> about keeping the codec on, this is done by i915 for us.
> 
> Based on discussion with Mark here at ELCE and other attempts by
> various folks on HDMI, I wanted to show on list the stuff we have
> done and discuss and try to see how we converge various attempts
> 
> The driver here only supports stereo and doesn't do multichannel
> just yet, will add later once we converge here. The support for
> using i915 component notification by David will be added later
> on.

I notice that you don't limit the capabilities of the ASoC device to
the capabilities of the HDMI sink - is that an intentional design
decision, or is it handled some other way?

I think that's the "interesting" part of HDMI - how should audio find
out the capabilities on the HDMI sink, and that's the area which people
have been struggling to design and come to some sort of concensus over.

I know HDA passes the ELD through hardware between the HDMI video and
HDMI audio side, which hides some of this with the existing ALSA PCI
HDA driver.

-- 
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

Re: [RFC 0/4] ASoC: Add HDA HDMI codec driver

[Vinod Koul]

On Fri, Oct 09, 2015 at 01:52:07PM +0100, Russell King - ARM Linux wrote:
> On Fri, Oct 09, 2015 at 01:28:45PM +0100, Vinod Koul wrote:
> > Yes, this patch series attempts to add yet another HDMI driver to
> > ASoC. This codec appears as HDA codec over HDA link. Although
> > the codec reside in display we have a HDA link from audio block
> > to this codec. The communication to codec is over HDA link
> > 
> > Thanks to i915 component infrastructure, we do not need to worry
> > about keeping the codec on, this is done by i915 for us.
> > 
> > Based on discussion with Mark here at ELCE and other attempts by
> > various folks on HDMI, I wanted to show on list the stuff we have
> > done and discuss and try to see how we converge various attempts
> > 
> > The driver here only supports stereo and doesn't do multichannel
> > just yet, will add later once we converge here. The support for
> > using i915 component notification by David will be added later
> > on.
> 
> I notice that you don't limit the capabilities of the ASoC device to
> the capabilities of the HDMI sink - is that an intentional design
> decision, or is it handled some other way?
> 
> I think that's the "interesting" part of HDMI - how should audio find
> out the capabilities on the HDMI sink, and that's the area which people
> have been struggling to design and come to some sort of concensus over.

I think we should set capabilities based on the sink capabilities. And these
should be set after reading the ELD. We want to do that when stream is
opened and we query ELD and set the constarinats based on ELD.
I have not added that code but this was the idea and was planned to come
after this

> I know HDA passes the ELD through hardware between the HDMI video and
> HDMI audio side, which hides some of this with the existing ALSA PCI
> HDA driver.

Yes that is true. But some times this is not quite reliable and getting
right ELD is little problematic resulting in breakages on HDA side.

So we have discussed this with Takashi and the general idea is that we add a
SW mechanism as well which will be based on i915 component framework to read
ELD reliably from display driver

I think as a general idea all the hdmi audio drivers should rely on component
interface generically to read ELD/ get notification (that was added
recently). Today on audio we have i915 component interface and IMHO this
should be made a generic audio-display component interface and used by all.
The callbacks are not really HDA based. But I don't really know on other
arch if that is doable or not...

-- 
~Vinod

Re: [RFC 0/4] ASoC: Add HDA HDMI codec driver

[Russell King - ARM Linux]

On Fri, Oct 09, 2015 at 04:17:48PM +0100, Vinod Koul wrote:
> On Fri, Oct 09, 2015 at 01:52:07PM +0100, Russell King - ARM Linux wrote:
> > On Fri, Oct 09, 2015 at 01:28:45PM +0100, Vinod Koul wrote:
> > > Yes, this patch series attempts to add yet another HDMI driver to
> > > ASoC. This codec appears as HDA codec over HDA link. Although
> > > the codec reside in display we have a HDA link from audio block
> > > to this codec. The communication to codec is over HDA link
> > > 
> > > Thanks to i915 component infrastructure, we do not need to worry
> > > about keeping the codec on, this is done by i915 for us.
> > > 
> > > Based on discussion with Mark here at ELCE and other attempts by
> > > various folks on HDMI, I wanted to show on list the stuff we have
> > > done and discuss and try to see how we converge various attempts
> > > 
> > > The driver here only supports stereo and doesn't do multichannel
> > > just yet, will add later once we converge here. The support for
> > > using i915 component notification by David will be added later
> > > on.
> > 
> > I notice that you don't limit the capabilities of the ASoC device to
> > the capabilities of the HDMI sink - is that an intentional design
> > decision, or is it handled some other way?
> > 
> > I think that's the "interesting" part of HDMI - how should audio find
> > out the capabilities on the HDMI sink, and that's the area which people
> > have been struggling to design and come to some sort of concensus over.
> 
> I think we should set capabilities based on the sink capabilities. And these
> should be set after reading the ELD. We want to do that when stream is
> opened and we query ELD and set the constarinats based on ELD.
> I have not added that code but this was the idea and was planned to come
> after this

Note that there's sound/core/pcm_drm_eld.c which should help you with
that.  Please help to improve it if it doesn't meet your needs - it's
a helper precisely to set the constraints based on ELD.

It tries to find the best fit of sample rate vs channels given a ELD
array of SADs.

> So we have discussed this with Takashi and the general idea is that we add a
> SW mechanism as well which will be based on i915 component framework to read
> ELD reliably from display driver
> 
> I think as a general idea all the hdmi audio drivers should rely on component
> interface generically to read ELD/ get notification (that was added
> recently). Today on audio we have i915 component interface and IMHO this
> should be made a generic audio-display component interface and used by all.
> The callbacks are not really HDA based. But I don't really know on other
> arch if that is doable or not...

Do you have a pointer to this work?

-- 
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

Re: [RFC 0/4] ASoC: Add HDA HDMI codec driver

[Vinod Koul]

On Fri, Oct 09, 2015 at 04:28:10PM +0100, Russell King - ARM Linux wrote:
> > I think we should set capabilities based on the sink capabilities. And these
> > should be set after reading the ELD. We want to do that when stream is
> > opened and we query ELD and set the constarinats based on ELD.
> > I have not added that code but this was the idea and was planned to come
> > after this
> 
> Note that there's sound/core/pcm_drm_eld.c which should help you with
> that.  Please help to improve it if it doesn't meet your needs - it's
> a helper precisely to set the constraints based on ELD.
> 
> It tries to find the best fit of sample rate vs channels given a ELD
> array of SADs.

That looks great. Yes I will use this and enhance it wherever required. It
makese sense to keep adding there rather than in driver

> > So we have discussed this with Takashi and the general idea is that we add a
> > SW mechanism as well which will be based on i915 component framework to read
> > ELD reliably from display driver
> > 
> > I think as a general idea all the hdmi audio drivers should rely on component
> > interface generically to read ELD/ get notification (that was added
> > recently). Today on audio we have i915 component interface and IMHO this
> > should be made a generic audio-display component interface and used by all.
> > The callbacks are not really HDA based. But I don't really know on other
> > arch if that is doable or not...
> 
> Do you have a pointer to this work?
sound/hda/hdac_i915.c

-- 
~Vinod

Re: [RFC 0/4] ASoC: Add HDA HDMI codec driver

[Koul, Vinod]

On Fri, 2015-10-09 at 13:28 +0100, Vinod Koul wrote:
> Yes, this patch series attempts to add yet another HDMI driver to
> ASoC. This codec appears as HDA codec over HDA link. Although
> the codec reside in display we have a HDA link from audio block
> to this codec. The communication to codec is over HDA link
> 
> Thanks to i915 component infrastructure, we do not need to worry
> about keeping the codec on, this is done by i915 for us.
> 
> Based on discussion with Mark here at ELCE and other attempts by
> various folks on HDMI, I wanted to show on list the stuff we have
> done and discuss and try to see how we converge various attempts
> 
> The driver here only supports stereo and doesn't do multichannel
> just yet, will add later once we converge here. The support for
> using i915 component notification by David will be added later
> on.

Apart from comments from Russell I didn't get any other comments.

So as a solution for many HDMI approaches in ASoC should we converge on usage of
component framework for talking to display and not have hard dependency to display
code. That sounds okay on X86 but I am not sure if other arch's can do this...

Also as discussed with Russell, we should use drivers/video/hdmi.c for HDMI
infoframes and sound/core/pcm_drm_eld.c for eld parsing. No open coding these :)

Lastly, sink properties should be the properties of the connected device as read from
ELD. That seems okay to me, other please chime in

I will send updated patchset based on above.

Thanks
-- 
~Vinod

Re: [RFC 0/4] ASoC: Add HDA HDMI codec driver

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 193 bytes --]

On Tue, Oct 13, 2015 at 01:08:27PM +0000, Koul, Vinod wrote:

> Apart from comments from Russell I didn't get any other comments.

There were mails from the LKP bot saying this didn't build...

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [RFC 0/4] ASoC: Add HDA HDMI codec driver

[Vinod Koul]

[-- Attachment #1.1: Type: text/plain, Size: 695 bytes --]

On Tue, Oct 20, 2015 at 01:15:36AM +0100, Mark Brown wrote:
> On Tue, Oct 13, 2015 at 01:08:27PM +0000, Koul, Vinod wrote:
> 
> > Apart from comments from Russell I didn't get any other comments.
> 
> There were mails from the LKP bot saying this didn't build...

That was due to dependency on patches Takashi applied which add the
read/write helpers.
Also I did miss one patch to add codec point in hdac device, will send that
one as well in next rev. Have also fixed the patch 4 to use info frame
handlers rather than earlier open code

Will send updated series later today which has been tested with latest
Takashi patches for auto loading these devices

Thanks
-- 
~Vinod

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [RFC 0/4] ASoC: Add HDA HDMI codec driver

[Hui Wang]

On 10/09/2015 08:28 PM, Vinod Koul wrote:
> Yes, this patch series attempts to add yet another HDMI driver to
> ASoC. This codec appears as HDA codec over HDA link. Although
> the codec reside in display we have a HDA link from audio block
> to this codec. The communication to codec is over HDA link
>
> Thanks to i915 component infrastructure, we do not need to worry
> about keeping the codec on, this is done by i915 for us.
>
> Based on discussion with Mark here at ELCE and other attempts by
> various folks on HDMI, I wanted to show on list the stuff we have
> done and discuss and try to see how we converge various attempts
>
> The driver here only supports stereo and doesn't do multichannel
> just yet, will add later once we converge here. The support for
> using i915 component notification by David will be added later
> on.
>
> Question/Comments welcome...
Hello Vinod,

Is this driver supposed to be working for Bay Trail and Cherry Trail as 
well? Right now we have an OEM product based on the Cherry Trail 
platform, there is no analog audio codec on it, the only audio device on 
the product is the HDMI audio (just like this one 
http://mailman.alsa-project.org/pipermail/alsa-devel/2015-August/096979.html). 
So could you please share some information about the support status for 
Cherry Trail HDMI audio, e.g. is the driver developed by your team? Is 
it still an out-of-tree driver right now? And do you plan to upstream it 
under the hdac_hdmi.c framework?

Thanks,
Hui.

>
> Subhransu S. Prusty (4):
>    ASoC: hdac-hdmi: Add hdmi driver
>    ASoC: hdac_hdmi: Add PM support for HDMI
>    ASoC: hdac_hdmi: Add hdac hdmi dai ops
>    ASoC: hdac_hdmi: Setup and start infoframe
>
>   sound/soc/codecs/Kconfig     |   4 +
>   sound/soc/codecs/Makefile    |   2 +
>   sound/soc/codecs/hdac_hdmi.c | 694 +++++++++++++++++++++++++++++++++++++++++++
>   3 files changed, 700 insertions(+)
>   create mode 100644 sound/soc/codecs/hdac_hdmi.c
>

Re: [RFC 0/4] ASoC: Add HDA HDMI codec driver

[Vinod Koul]

On Thu, Oct 22, 2015 at 10:22:32AM +0800, Hui Wang wrote:
> On 10/09/2015 08:28 PM, Vinod Koul wrote:
> >Yes, this patch series attempts to add yet another HDMI driver to
> >ASoC. This codec appears as HDA codec over HDA link. Although
> >the codec reside in display we have a HDA link from audio block
> >to this codec. The communication to codec is over HDA link
> >
> >Thanks to i915 component infrastructure, we do not need to worry
> >about keeping the codec on, this is done by i915 for us.
> >
> >Based on discussion with Mark here at ELCE and other attempts by
> >various folks on HDMI, I wanted to show on list the stuff we have
> >done and discuss and try to see how we converge various attempts
> >
> >The driver here only supports stereo and doesn't do multichannel
> >just yet, will add later once we converge here. The support for
> >using i915 component notification by David will be added later
> >on.
> >
> >Question/Comments welcome...
> Hello Vinod,
> 
> Is this driver supposed to be working for Bay Trail and Cherry Trail
> as well? Right now we have an OEM product based on the Cherry Trail
> platform, there is no analog audio codec on it, the only audio
> device on the product is the HDMI audio (just like this one http://mailman.alsa-project.org/pipermail/alsa-devel/2015-August/096979.html).
> So could you please share some information about the support status
> for Cherry Trail HDMI audio, e.g. is the driver developed by your
> team? Is it still an out-of-tree driver right now? And do you plan
> to upstream it under the hdac_hdmi.c framework?

Hello Hui,

No this driver is applicable to Skylake onwards. I believe canonical already
has a driver for HDMI BYT and you can use that and btw David knows about it

-- 
~Vinod