Skip to contentSkip to conversation

support DP MST audio

PATCH Superseded [email protected] 3 participants 16 messages Dec 6, 2016 – Jan 11, 2017

Subsystems (2)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover support DP MST audio

From: Libin Yang <[email protected]>

This patchset starts to support DP MST audio.

This patchset is based on drm-tip on
git://anongit.freedesktop.org/drm-tip

change log:
v4: refine some comments in 0001 and 0002 patches.
refine the 0003 patch for the new ALSA-Configuration document

Libin Yang (3):
ALSA: hda - add DP mst verb support
ALSA: hda - add DP MST audio support
ALSA: Documentation about HDA DP MST pin init and connection

 Documentation/sound/hd-audio/dp-mst.rst |  17 +++
 sound/pci/hda/hda_codec.c               |  76 +++++++++-
 sound/pci/hda/hda_codec.h               |   3 +
 sound/pci/hda/patch_hdmi.c              | 245 +++++++++++++++++++++++++-------
 4 files changed, 285 insertions(+), 56 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH v4 1/3 ALSA: hda - add DP mst verb support

From: Libin Yang <[email protected]>

Add snd_hda_get_dev_select() and snd_hda_set_dev_select() functions for DP MST audio support.

---
 sound/pci/hda/hda_codec.c | 72 ++++++++++++++++++++++++++++++++++++++++++++---
 sound/pci/hda/hda_codec.h |  3 ++
 2 files changed, 71 insertions(+), 4 deletions(-)
sound/pci/hda/hda_codec.c +68 -4
index 9913be8..9dc847d 100644
@@ -311,9 +311,15 @@ int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,
 }
 EXPORT_SYMBOL_GPL(snd_hda_get_conn_index);
 
-
-/* return DEVLIST_LEN parameter of the given widget */
-static unsigned int get_num_devices(struct hda_codec *codec, hda_nid_t nid)
+/**
+ * snd_hda_get_num_devices - get DEVLIST_LEN parameter of the given widget
+ *  @codec: the HDA codec
+ *  @nid: NID of the pin to parse
+ *
+ * Get the device entry number on the given widget. This is a feature of
+ * DP MST audio. Each pin can have several device entries in it.
+ */
+unsigned int snd_hda_get_num_devices(struct hda_codec *codec, hda_nid_t nid)
 {
 	unsigned int wcaps = get_wcaps(codec, nid);
 	unsigned int parm;
@@ -327,6 +333,7 @@ static unsigned int get_num_devices(struct hda_codec *codec, hda_nid_t nid)
 		parm = 0;
 	return parm & AC_DEV_LIST_LEN_MASK;
 }
+EXPORT_SYMBOL_GPL(snd_hda_get_num_devices);
 
 /**
  * snd_hda_get_devices - copy device list without cache
@@ -344,7 +351,7 @@ int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,
 	unsigned int parm;
 	int i, dev_len, devices;
 
-	parm = get_num_devices(codec, nid);
+	parm = snd_hda_get_num_devices(codec, nid);
 	if (!parm)	/* not multi-stream capable */
 		return 0;
 
@@ -368,6 +375,63 @@ int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,
 	return devices;
 }
 
+/**
+ * snd_hda_get_dev_select - get device entry select on the pin
+ * @codec: the HDA codec
+ * @nid: NID of the pin to get device entry select
+ *
+ * Get the devcie entry select on the pin. Return the device entry
+ * id selected on the pin. Return 0 means the first device entry
+ * is selected or MST is not supported.
+ */
+int snd_hda_get_dev_select(struct hda_codec *codec, hda_nid_t nid)
+{
+	/* not support dp_mst will always return 0, using first dev_entry */
+	if (!codec->dp_mst)
+		return 0;
+
+	return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DEVICE_SEL, 0);
+}
+EXPORT_SYMBOL_GPL(snd_hda_get_dev_select);
+
+/**
+ * snd_hda_set_dev_select - set device entry select on the pin
+ * @codec: the HDA codec
+ * @nid: NID of the pin to set device entry select
+ * @dev_id: device entry id to be set
+ *
+ * Set the device entry select on the pin nid.
+ */
+int snd_hda_set_dev_select(struct hda_codec *codec, hda_nid_t nid, int dev_id)
+{
+	int ret, num_devices;
+
+	/* not support dp_mst will always return 0, using first dev_entry */
+	if (!codec->dp_mst)
+		return 0;
+
+	/* AC_PAR_DEVLIST_LEN is 0 based. */
+	num_devices = snd_hda_get_num_devices(codec, nid) + 1;
+	/* If Device List Length is 0 (num_device = 1),
+	 * the pin is not multi stream capable.
+	 * Do nothing in this case.
+	 */
+	if (num_devices == 1)
+		return 0;
+
+	/* Behavior of setting index being equal to or greater than
+	 * Device List Length is not predictable
+	 */
+	if (num_devices <= dev_id)
+		return -EINVAL;
+
+	ret = snd_hda_codec_write(codec, nid, 0,
+			AC_VERB_SET_DEVICE_SEL, dev_id);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(snd_hda_set_dev_select);
+
 /*
  * read widget caps for each widget and store in cache
  */
sound/pci/hda/hda_codec.h +3 -0
index 373fcad..f17f252 100644
@@ -347,8 +347,11 @@ int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int nums,
 			  const hda_nid_t *list);
 int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,
 			   hda_nid_t nid, int recursive);
+unsigned int snd_hda_get_num_devices(struct hda_codec *codec, hda_nid_t nid);
 int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,
 			u8 *dev_list, int max_devices);
+int snd_hda_get_dev_select(struct hda_codec *codec, hda_nid_t nid);
+int snd_hda_set_dev_select(struct hda_codec *codec, hda_nid_t nid, int dev_id);
 
 struct hda_verb {
 	hda_nid_t nid;
Signature · 1 line
2.7.4
#2 lore raw

PATCH v4 2/3 ALSA: hda - add DP MST audio support

In reply to [email protected]

From: Libin Yang <[email protected]>

This patch adds the DP MST audio support on i915 platform and it will enable dyn_pcm_assign feature.

DP MST supports several device entry on the same port and each device entry can map to one pcm stream. For example, on i915, there are 3 pins, and each pin has 3 device entries. This means there should be 3x3 pcms. However, there is only 3 pipe lines in i915. This means 3 pcms are actived at most at the same moment. We will create 5 pcms (pin number + dev entry num - 1) in this case. For the details, please refer commit a76056f2e57e
("ALSA: hda - hdmi dynamically bind PCM to pin when monitor hotplug")

Each device entry is a virtual pin. It is described by pin_nid and dev_id in struct hdmi_spec_per_pin.

---
 sound/pci/hda/hda_codec.c  |   4 +
 sound/pci/hda/patch_hdmi.c | 245 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 197 insertions(+), 52 deletions(-)
sound/pci/hda/hda_codec.c +4 -0
index 9dc847d..8fd745c 100644
@@ -467,6 +467,10 @@ static int read_pin_defaults(struct hda_codec *codec)
 		pin->nid = nid;
 		pin->cfg = snd_hda_codec_read(codec, nid, 0,
 					      AC_VERB_GET_CONFIG_DEFAULT, 0);
+		/*
+		 * all device entries are the same widget control so far
+		 * fixme: if any codec is different, need fix here
+		 */
 		pin->ctrl = snd_hda_codec_read(codec, nid, 0,
 					       AC_VERB_GET_PIN_WIDGET_CONTROL,
 					       0);
sound/pci/hda/patch_hdmi.c +193 -52

471 lines not on this page · raw message

Signature · 1 line
2.7.4
#3 lore raw

PATCH v4 3/3 ALSA: Documentation about HDA DP MST pin init and connection

In reply to [email protected]

From: Libin Yang <[email protected]>

Add the documentation about HD-audio DP MST:
1. pin initialization
2. device entry connection list

---
 Documentation/sound/hd-audio/dp-mst.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
Documentation/sound/hd-audio/dp-mst.rst +17 -0
index 58b7243..1617459 100644
@@ -19,6 +19,23 @@ PCM
 ===
 To be added
 
+Pin Initialization
+==================
+Each pin may have several device entries (virtual pins). On Intel platform,
+the device entries number is dynamically changed. If DP MST hub is connected,
+it is in DP MST mode, and the device entries number is 3. Otherwise, the
+device entries number is 1.
+
+To simplify the implementation, all the device entries will be initialized
+when bootup no matter whether it is in DP MST mode or not.
+
+Connection list
+===============
+DP MST reuses connection list code. The code can be reused because
+device entries on the same pin have the same connection list.
+
+This means DP MST gets the device entry connection list without the
+device entry setting.
 
 Jack
 ====
Signature · 1 line
2.7.4
#4 lore raw
In reply to [email protected]

The patchset is based on drm-tip branch in
git://anongit.freedesktop.org/drm-tip

Regards,
Libin

Quoted 33 lines

-----Original Message-----
From: Yang, Libin
Sent: Tuesday, December 6, 2016 10:49 AM
To: [email protected]; [email protected]
Cc: Lin, Mengdong <[email protected]>; Yang, Libin <[email protected]>
Subject: [alsa-devel] [PATCH v4 0/3] support DP MST audio

From: Libin Yang <[email protected]>

This patchset starts to support DP MST audio.

This patchset is based on drm-tip on
git://anongit.freedesktop.org/drm-tip

change log:
v4: refine some comments in 0001 and 0002 patches.
refine the 0003 patch for the new ALSA-Configuration document

Libin Yang (3):
ALSA: hda - add DP mst verb support
ALSA: hda - add DP MST audio support
ALSA: Documentation about HDA DP MST pin init and connection

Documentation/sound/hd-audio/dp-mst.rst |  17 +++
sound/pci/hda/hda_codec.c               |  76 +++++++++-
sound/pci/hda/hda_codec.h               |   3 +
sound/pci/hda/patch_hdmi.c              | 245 +++++++++++++++++++++++++------
-
4 files changed, 285 insertions(+), 56 deletions(-)

--
2.7.4

#5 lore raw
Quoted 3 lines · Libin

The patchset is based on drm-tip branch in
git://anongit.freedesktop.org/drm-tip

I'll review and merge if it's OK.

Daniel, do you guys have the stable branch that I can pull into sound tree for DP-MST audio stuff for 4.10?

thanks,

Takashi

Quoted 38 lines

Regards,
Libin

Quoted 33 lines

-----Original Message-----
From: Yang, Libin
Sent: Tuesday, December 6, 2016 10:49 AM
To: [email protected]; [email protected]
Cc: Lin, Mengdong <[email protected]>; Yang, Libin <[email protected]>
Subject: [alsa-devel] [PATCH v4 0/3] support DP MST audio

From: Libin Yang <[email protected]>

This patchset starts to support DP MST audio.

This patchset is based on drm-tip on
git://anongit.freedesktop.org/drm-tip

change log:
v4: refine some comments in 0001 and 0002 patches.
refine the 0003 patch for the new ALSA-Configuration document

Libin Yang (3):
ALSA: hda - add DP mst verb support
ALSA: hda - add DP MST audio support
ALSA: Documentation about HDA DP MST pin init and connection

Documentation/sound/hd-audio/dp-mst.rst |  17 +++
sound/pci/hda/hda_codec.c               |  76 +++++++++-
sound/pci/hda/hda_codec.h               |   3 +
sound/pci/hda/patch_hdmi.c              | 245 +++++++++++++++++++++++++------
-
4 files changed, 285 insertions(+), 56 deletions(-)

--
2.7.4

#6 lore raw
Quoted 10 lines · Takashi Iwai
Quoted 3 lines · Libin

The patchset is based on drm-tip branch in
git://anongit.freedesktop.org/drm-tip

I'll review and merge if it's OK.

Daniel, do you guys have the stable branch that I can pull into sound tree for DP-MST audio stuff for 4.10?

DP mst audio support missed 4.10 over here on the drm side. And I wasn't aware that we need a topic branch for it, so I just smashed it into our drm-intel-next queue ... I can send you the most recent stable tag for that, but that's heading in only for 4.11. -Daniel

Quoted 45 lines

thanks,

Takashi

Quoted 38 lines

Regards,
Libin

Quoted 33 lines

-----Original Message-----
From: Yang, Libin
Sent: Tuesday, December 6, 2016 10:49 AM
To: [email protected]; [email protected]
Cc: Lin, Mengdong <[email protected]>; Yang, Libin <[email protected]>
Subject: [alsa-devel] [PATCH v4 0/3] support DP MST audio

From: Libin Yang <[email protected]>

This patchset starts to support DP MST audio.

This patchset is based on drm-tip on
git://anongit.freedesktop.org/drm-tip

change log:
v4: refine some comments in 0001 and 0002 patches.
refine the 0003 patch for the new ALSA-Configuration document

Libin Yang (3):
ALSA: hda - add DP mst verb support
ALSA: hda - add DP MST audio support
ALSA: Documentation about HDA DP MST pin init and connection

Documentation/sound/hd-audio/dp-mst.rst |  17 +++
sound/pci/hda/hda_codec.c               |  76 +++++++++-
sound/pci/hda/hda_codec.h               |   3 +
sound/pci/hda/patch_hdmi.c              | 245 +++++++++++++++++++++++++------
-
4 files changed, 285 insertions(+), 56 deletions(-)

--
2.7.4

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw
Quoted 10 lines · Daniel Vetter
Quoted 8 lines · Takashi Iwai
Quoted 3 lines · Libin

The patchset is based on drm-tip branch in
git://anongit.freedesktop.org/drm-tip

I'll review and merge if it's OK.

Quoted 7 lines
Quoted 2 lines

Daniel, do you guys have the stable branch that I can pull into sound tree for DP-MST audio stuff for 4.10?

DP mst audio support missed 4.10 over here on the drm side. And I wasn't aware that we need a topic branch for it, so I just smashed it into our drm-intel-next queue ... I can send you the most recent stable tag for that, but that's heading in only for 4.11.

It's fine, we can postpone to 4.11 as well. I just thought it were already queued for 4.10.

If so, I'm going to queue these patches once after 4.10-rc1 is released.

thanks,

Takashi

Quoted 44 lines

-Daniel

Quoted 42 lines

thanks,

Takashi

Quoted 35 lines

Regards,
Libin

Quoted 31 lines

-----Original Message-----
From: Yang, Libin
Sent: Tuesday, December 6, 2016 10:49 AM
To: [email protected]; [email protected]
Cc: Lin, Mengdong <[email protected]>; Yang, Libin <[email protected]>
Subject: [alsa-devel] [PATCH v4 0/3] support DP MST audio

From: Libin Yang <[email protected]>

This patchset starts to support DP MST audio.

This patchset is based on drm-tip on
git://anongit.freedesktop.org/drm-tip

change log:
v4: refine some comments in 0001 and 0002 patches.
refine the 0003 patch for the new ALSA-Configuration document

Libin Yang (3):
ALSA: hda - add DP mst verb support
ALSA: hda - add DP MST audio support
ALSA: Documentation about HDA DP MST pin init and connection

Documentation/sound/hd-audio/dp-mst.rst |  17 +++
sound/pci/hda/hda_codec.c               |  76 +++++++++-
sound/pci/hda/hda_codec.h               |   3 +
sound/pci/hda/patch_hdmi.c              | 245 +++++++++++++++++++++++++------
-
4 files changed, 285 insertions(+), 56 deletions(-)
Quoted 11 lines
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines

--
2.7.4

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

Hi Takashi,

It seems the patches for DP MST in gfx is not merged into Linus branch.

Do we have plan to merge gfx branch manually and review the patches for audio? Or we will wait the DP MST patches for i915 merged into Linus branch?

Regards,
Libin

Quoted 77 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, December 6, 2016 4:11 PM
To: Daniel Vetter <[email protected]>
Cc: intel-gfx <[email protected]>; Nikula, Jani <[email protected]>; Yang, Libin <[email protected]>; alsa- [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 10 lines · Daniel Vetter
Quoted 8 lines · Takashi Iwai
Quoted 3 lines · Libin

The patchset is based on drm-tip branch in
git://anongit.freedesktop.org/drm-tip

I'll review and merge if it's OK.

Quoted 7 lines
Quoted 2 lines

Daniel, do you guys have the stable branch that I can pull into sound tree for DP-MST audio stuff for 4.10?

DP mst audio support missed 4.10 over here on the drm side. And I wasn't aware that we need a topic branch for it, so I just smashed it into our drm-intel-next queue ... I can send you the most recent stable tag for that, but that's heading in only for 4.11.

It's fine, we can postpone to 4.11 as well. I just thought it were already queued for 4.10.

If so, I'm going to queue these patches once after 4.10-rc1 is released.

thanks,

Takashi

Quoted 37 lines

-Daniel

Quoted 35 lines

thanks,

Takashi

Quoted 28 lines

Regards,
Libin

Quoted 24 lines

-----Original Message-----
From: Yang, Libin
Sent: Tuesday, December 6, 2016 10:49 AM
To: [email protected]; [email protected]
Cc: Lin, Mengdong <[email protected]>; Yang, Libin <[email protected]>
Subject: [alsa-devel] [PATCH v4 0/3] support DP MST audio

From: Libin Yang <[email protected]>

This patchset starts to support DP MST audio.

This patchset is based on drm-tip on
git://anongit.freedesktop.org/drm-tip

change log:
v4: refine some comments in 0001 and 0002 patches.
refine the 0003 patch for the new ALSA-Configuration document

Libin Yang (3):
ALSA: hda - add DP mst verb support
ALSA: hda - add DP MST audio support
ALSA: Documentation about HDA DP MST pin init and connection

Quoted 19 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Documentation/sound/hd-audio/dp-mst.rst |  17 +++
sound/pci/hda/hda_codec.c               |  76 +++++++++-
sound/pci/hda/hda_codec.h               |   3 +
sound/pci/hda/patch_hdmi.c              | 245

+++++++++++++++++++++++++------

Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines

-

4 files changed, 285 insertions(+), 56 deletions(-)

--
2.7.4

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
Quoted 6 lines · Libin

Hi Takashi,

It seems the patches for DP MST in gfx is not merged into Linus branch.

Do we have plan to merge gfx branch manually and review the patches for audio? Or we will wait the DP MST patches for i915 merged into Linus branch?

Sorry, this was delayed due to the vacation.
Now I applied these three patches to topic/hda-dp-mst branch based on 4.10-rc2, and it was merged to for-next branch.

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/hda-dp-mst

Daniel, Jani, if you guys need to merge to i915 tree, feel free to pull from that branch.

thanks,

Takashi

Quoted 102 lines

Regards,
Libin

Quoted 96 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, December 6, 2016 4:11 PM
To: Daniel Vetter <[email protected]>
Cc: intel-gfx <[email protected]>; Nikula, Jani <[email protected]>; Yang, Libin <[email protected]>; alsa- [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 10 lines · Daniel Vetter
Quoted 8 lines · Takashi Iwai
Quoted 3 lines · Libin

The patchset is based on drm-tip branch in
git://anongit.freedesktop.org/drm-tip

I'll review and merge if it's OK.

Quoted 7 lines
Quoted 2 lines

Daniel, do you guys have the stable branch that I can pull into sound tree for DP-MST audio stuff for 4.10?

DP mst audio support missed 4.10 over here on the drm side. And I wasn't aware that we need a topic branch for it, so I just smashed it into our drm-intel-next queue ... I can send you the most recent stable tag for that, but that's heading in only for 4.11.

It's fine, we can postpone to 4.11 as well. I just thought it were already queued for 4.10.

If so, I'm going to queue these patches once after 4.10-rc1 is released.

thanks,

Takashi

Quoted 41 lines

-Daniel

Quoted 39 lines

thanks,

Takashi

Quoted 32 lines

Regards,
Libin

Quoted 28 lines

-----Original Message-----
From: Yang, Libin
Sent: Tuesday, December 6, 2016 10:49 AM
To: [email protected]; [email protected]
Cc: Lin, Mengdong <[email protected]>; Yang, Libin <[email protected]>
Subject: [alsa-devel] [PATCH v4 0/3] support DP MST audio

From: Libin Yang <[email protected]>

This patchset starts to support DP MST audio.

This patchset is based on drm-tip on
git://anongit.freedesktop.org/drm-tip

change log:
v4: refine some comments in 0001 and 0002 patches.
refine the 0003 patch for the new ALSA-Configuration document

Libin Yang (3):
ALSA: hda - add DP mst verb support
ALSA: hda - add DP MST audio support
ALSA: Documentation about HDA DP MST pin init and connection

Documentation/sound/hd-audio/dp-mst.rst |  17 +++
sound/pci/hda/hda_codec.c               |  76 +++++++++-
sound/pci/hda/hda_codec.h               |   3 +
sound/pci/hda/patch_hdmi.c              | 245

+++++++++++++++++++++++++------

Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines

-

4 files changed, 285 insertions(+), 56 deletions(-)

--
2.7.4

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

Hi Takashi,

Quoted 17 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, January 10, 2017 4:19 PM
To: Yang, Libin <[email protected]>
Cc: Daniel Vetter <[email protected]>; intel-gfx <[email protected]>; Nikula, Jani <[email protected]>; [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 6 lines · Libin

Hi Takashi,

It seems the patches for DP MST in gfx is not merged into Linus branch.

Do we have plan to merge gfx branch manually and review the patches for

Quoted 8 lines

audio? Or we will wait the DP MST patches for i915 merged into Linus branch?

Sorry, this was delayed due to the vacation.
Now I applied these three patches to topic/hda-dp-mst branch based on 4.10- rc2, and it was merged to for-next branch.

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/hda-dp-
mst

Thanks. These audio patches are based on the i915 dp mst patches. Without I915 driver patches support, it will make errors.

Regards,
Libin

Quoted 111 lines

Daniel, Jani, if you guys need to merge to i915 tree, feel free to pull from that branch.

thanks,

Takashi

Quoted 102 lines

Regards,
Libin

Quoted 96 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, December 6, 2016 4:11 PM
To: Daniel Vetter <[email protected]>
Cc: intel-gfx <[email protected]>; Nikula, Jani <[email protected]>; Yang, Libin <[email protected]>; alsa- [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 9 lines · Daniel Vetter
Quoted 7 lines · Takashi Iwai
Quoted 3 lines · Libin

The patchset is based on drm-tip branch in
git://anongit.freedesktop.org/drm-tip

I'll review and merge if it's OK.

Quoted 7 lines
Quoted 2 lines

Daniel, do you guys have the stable branch that I can pull into sound tree for DP-MST audio stuff for 4.10?

DP mst audio support missed 4.10 over here on the drm side. And I wasn't aware that we need a topic branch for it, so I just smashed it into our drm-intel-next queue ... I can send you the most recent stable tag for that, but that's heading in only for 4.11.

It's fine, we can postpone to 4.11 as well. I just thought it were already queued for 4.10.

If so, I'm going to queue these patches once after 4.10-rc1 is released.

thanks,

Takashi

Quoted 42 lines

-Daniel

Quoted 40 lines

thanks,

Takashi

Quoted 33 lines

Regards,
Libin

Quoted 29 lines

-----Original Message-----
From: Yang, Libin
Sent: Tuesday, December 6, 2016 10:49 AM
To: [email protected]; [email protected]
Cc: Lin, Mengdong <[email protected]>; Yang, Libin <[email protected]>
Subject: [alsa-devel] [PATCH v4 0/3] support DP MST audio

From: Libin Yang <[email protected]>

This patchset starts to support DP MST audio.

This patchset is based on drm-tip on
git://anongit.freedesktop.org/drm-tip

change log:
v4: refine some comments in 0001 and 0002 patches.
refine the 0003 patch for the new ALSA-Configuration
document

Libin Yang (3):
ALSA: hda - add DP mst verb support
ALSA: hda - add DP MST audio support
ALSA: Documentation about HDA DP MST pin init and connection

Documentation/sound/hd-audio/dp-mst.rst |  17 +++
sound/pci/hda/hda_codec.c               |  76 +++++++++-
sound/pci/hda/hda_codec.h               |   3 +
sound/pci/hda/patch_hdmi.c              | 245

+++++++++++++++++++++++++------

Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines

-

4 files changed, 285 insertions(+), 56 deletions(-)

--
2.7.4

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw
Quoted 26 lines · Libin

Hi Takashi,

Quoted 23 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, January 10, 2017 4:19 PM
To: Yang, Libin <[email protected]>
Cc: Daniel Vetter <[email protected]>; intel-gfx <[email protected]>; Nikula, Jani <[email protected]>; [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 6 lines · Libin

Hi Takashi,

It seems the patches for DP MST in gfx is not merged into Linus branch.

Do we have plan to merge gfx branch manually and review the patches for

audio? Or we will wait the DP MST patches for i915 merged into Linus branch?

Sorry, this was delayed due to the vacation.
Now I applied these three patches to topic/hda-dp-mst branch based on 4.10- rc2, and it was merged to for-next branch.

Quoted 5 lines
Quoted 2 lines

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/hda-dp-
mst

Thanks. These audio patches are based on the i915 dp mst patches. Without I915 driver patches support, it will make errors.

Ah yeah, I forgot it. So I removed it from for-next branch, but topic/hda-dp-mst branch is kept so that it can be merged to i915 tree.

Let me know if there is any i915 branch I can pull into sound tree.

thanks,

Takashi

Quoted 116 lines

Regards,
Libin

Quoted 111 lines

Daniel, Jani, if you guys need to merge to i915 tree, feel free to pull from that branch.

thanks,

Takashi

Quoted 102 lines

Regards,
Libin

Quoted 96 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, December 6, 2016 4:11 PM
To: Daniel Vetter <[email protected]>
Cc: intel-gfx <[email protected]>; Nikula, Jani <[email protected]>; Yang, Libin <[email protected]>; alsa- [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 9 lines · Daniel Vetter
Quoted 7 lines · Takashi Iwai
Quoted 3 lines · Libin

The patchset is based on drm-tip branch in
git://anongit.freedesktop.org/drm-tip

I'll review and merge if it's OK.

Quoted 7 lines
Quoted 2 lines

Daniel, do you guys have the stable branch that I can pull into sound tree for DP-MST audio stuff for 4.10?

DP mst audio support missed 4.10 over here on the drm side. And I wasn't aware that we need a topic branch for it, so I just smashed it into our drm-intel-next queue ... I can send you the most recent stable tag for that, but that's heading in only for 4.11.

It's fine, we can postpone to 4.11 as well. I just thought it were already queued for 4.10.

If so, I'm going to queue these patches once after 4.10-rc1 is released.

thanks,

Takashi

Quoted 42 lines

-Daniel

Quoted 40 lines

thanks,

Takashi

Quoted 33 lines

Regards,
Libin

Quoted 29 lines

-----Original Message-----
From: Yang, Libin
Sent: Tuesday, December 6, 2016 10:49 AM
To: [email protected]; [email protected]
Cc: Lin, Mengdong <[email protected]>; Yang, Libin <[email protected]>
Subject: [alsa-devel] [PATCH v4 0/3] support DP MST audio

From: Libin Yang <[email protected]>

This patchset starts to support DP MST audio.

This patchset is based on drm-tip on
git://anongit.freedesktop.org/drm-tip

change log:
v4: refine some comments in 0001 and 0002 patches.
refine the 0003 patch for the new ALSA-Configuration
document

Libin Yang (3):
ALSA: hda - add DP mst verb support
ALSA: hda - add DP MST audio support
ALSA: Documentation about HDA DP MST pin init and connection

Documentation/sound/hd-audio/dp-mst.rst |  17 +++
sound/pci/hda/hda_codec.c               |  76 +++++++++-
sound/pci/hda/hda_codec.h               |   3 +
sound/pci/hda/patch_hdmi.c              | 245

+++++++++++++++++++++++++------

Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines

-

4 files changed, 285 insertions(+), 56 deletions(-)

--
2.7.4

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw
Quoted 27 lines · Takashi Iwai

On Tue, 10 Jan 2017 09:45:31 +0100,

Quoted 26 lines
Quoted 25 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, January 10, 2017 4:19 PM
To: Yang, Libin <[email protected]>
Cc: Daniel Vetter <[email protected]>; intel-gfx <[email protected]>; Nikula, Jani <[email protected]>; [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 6 lines · Libin

Hi Takashi,

It seems the patches for DP MST in gfx is not merged into Linus branch.

Do we have plan to merge gfx branch manually and review the patches for

audio? Or we will wait the DP MST patches for i915 merged into Linus branch?

Sorry, this was delayed due to the vacation.
Now I applied these three patches to topic/hda-dp-mst branch based on 4.10- rc2, and it was merged to for-next branch.

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/hda-dp-
mst

Quoted 8 lines
Quoted 2 lines

Thanks. These audio patches are based on the i915 dp mst patches. Without I915 driver patches support, it will make errors.

Ah yeah, I forgot it. So I removed it from for-next branch, but topic/hda-dp-mst branch is kept so that it can be merged to i915 tree.

Let me know if there is any i915 branch I can pull into sound tree.

Aw, I didn't know that the depency goes this way round, the dp mst patches (I'm not even sure which ones they are) on the i915 are just on the general pile. So not anywhere near a place where I can make a topic branch.

I guess what needs to be done now is a cherry-picked list of just the patches we need, on top of -rc3, that I can then pull into drm-intel.git plus send a pull request for that to Takashi. That means the patches are twice in drm-intel.git, but if we cherry-pick reference them correctly then that should be all ok and can't really be helped.

Or we just delay the audio side for 4.12, dp mst audio support is 4 years late anyway, so one more release won'thurt that much ;-) -Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by
#13 lore raw
Quoted 50 lines · Daniel Vetter
Quoted 27 lines · Takashi Iwai

On Tue, 10 Jan 2017 09:45:31 +0100,

Quoted 26 lines
Quoted 25 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, January 10, 2017 4:19 PM
To: Yang, Libin <[email protected]>
Cc: Daniel Vetter <[email protected]>; intel-gfx <[email protected]>; Nikula, Jani <[email protected]>; [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 6 lines · Libin

Hi Takashi,

It seems the patches for DP MST in gfx is not merged into Linus branch.

Do we have plan to merge gfx branch manually and review the patches for

audio? Or we will wait the DP MST patches for i915 merged into Linus branch?

Sorry, this was delayed due to the vacation.
Now I applied these three patches to topic/hda-dp-mst branch based on 4.10- rc2, and it was merged to for-next branch.

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/hda-dp-
mst

Quoted 8 lines
Quoted 2 lines

Thanks. These audio patches are based on the i915 dp mst patches. Without I915 driver patches support, it will make errors.

Ah yeah, I forgot it. So I removed it from for-next branch, but topic/hda-dp-mst branch is kept so that it can be merged to i915 tree.

Let me know if there is any i915 branch I can pull into sound tree.

Aw, I didn't know that the depency goes this way round, the dp mst patches (I'm not even sure which ones they are) on the i915 are just on the general pile. So not anywhere near a place where I can make a topic branch.

I guess what needs to be done now is a cherry-picked list of just the patches we need, on top of -rc3, that I can then pull into drm-intel.git plus send a pull request for that to Takashi. That means the patches are twice in drm-intel.git, but if we cherry-pick reference them correctly then that should be all ok and can't really be helped.

Quoted 2 lines

Or we just delay the audio side for 4.12, dp mst audio support is 4 years late anyway, so one more release won'thurt that much ;-)

Well, thinking of the amount of patches, I guess we can do other way
round: basically it's fine to apply Libin's latest patches to drm tree for 4.11, if it makes things easier. I don't think we'll have a big conflict with these changes for others during 4.11 development. If any, I can pull some of stable point from drm tree.

Does it work for you? If yes, feel free to apply these three sound patches to drm or i915 tree with my ack.

thanks,

Takashi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#14 lore raw
Quoted 61 lines · Takashi Iwai
Quoted 50 lines · Daniel Vetter
Quoted 27 lines · Takashi Iwai

On Tue, 10 Jan 2017 09:45:31 +0100,

Quoted 26 lines
Quoted 25 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, January 10, 2017 4:19 PM
To: Yang, Libin <[email protected]>
Cc: Daniel Vetter <[email protected]>; intel-gfx <[email protected]>; Nikula, Jani <[email protected]>; [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 6 lines · Libin

Hi Takashi,

It seems the patches for DP MST in gfx is not merged into Linus branch.

Do we have plan to merge gfx branch manually and review the patches for

audio? Or we will wait the DP MST patches for i915 merged into Linus branch?

Sorry, this was delayed due to the vacation.
Now I applied these three patches to topic/hda-dp-mst branch based on 4.10- rc2, and it was merged to for-next branch.

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/hda-dp-
mst

Quoted 8 lines
Quoted 2 lines

Thanks. These audio patches are based on the i915 dp mst patches. Without I915 driver patches support, it will make errors.

Ah yeah, I forgot it. So I removed it from for-next branch, but topic/hda-dp-mst branch is kept so that it can be merged to i915 tree.

Let me know if there is any i915 branch I can pull into sound tree.

Aw, I didn't know that the depency goes this way round, the dp mst patches (I'm not even sure which ones they are) on the i915 are just on the general pile. So not anywhere near a place where I can make a topic branch.

I guess what needs to be done now is a cherry-picked list of just the patches we need, on top of -rc3, that I can then pull into drm-intel.git plus send a pull request for that to Takashi. That means the patches are twice in drm-intel.git, but if we cherry-pick reference them correctly then that should be all ok and can't really be helped.

Quoted 2 lines

Or we just delay the audio side for 4.12, dp mst audio support is 4 years late anyway, so one more release won'thurt that much ;-)

Well, thinking of the amount of patches, I guess we can do other way
round: basically it's fine to apply Libin's latest patches to drm tree for 4.11, if it makes things easier. I don't think we'll have a big conflict with these changes for others during 4.11 development. If any, I can pull some of stable point from drm tree.

Quoted 4 lines

Does it work for you? If yes, feel free to apply these three sound patches to drm or i915 tree with my ack.

Works for me too. Libin, can you pls resend (somehow this thread disconnected from the patches for me), with Takashi's r-b + ack for merging through drm-intel?

Thanks, Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#15 lore raw

Hi Daniel,

OK, I will resend the patches tomorrow. Thanks.

Hi Takashi,

In case you still need the patches for i915, it is on
git://anongit.freedesktop.org/drm-tip:drm-tip

My patches are:

commit 9a148a96fc3a654ddcf142a7ab7db37b972ba5d8
drm/i915/debugfs: add dp mst info

commit 9935f7fa2854355203e3976762eecfb218079aac
drm/i915: abstract ddi being audio enabled

commit 7f9e77545b92bcb894b8e2be5646535e8ba8da9e
drm/i915: enable dp mst audio

commit 31613268c0a6f7abdb0c19487a084249bcf203ba drm/i915/audio: extend get_saved_enc() to support more scenarios

commit f55d23be11ed15f493957246f3b81fc530e79d70 drm/i915/audio: extend audio sync rate support for DP MST

And you may still need the patches in gfx to fix the flicker issue, which Dhinakaran can help.

Regards,
Libin

Quoted 86 lines

-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Wednesday, January 11, 2017 4:35 PM
To: Takashi Iwai <[email protected]>
Cc: Daniel Vetter <[email protected]>; Yang, Libin <[email protected]>; intel- gfx <[email protected]>; Nikula, Jani <[email protected]>; [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 16 lines · Takashi Iwai
Quoted 14 lines · Daniel Vetter
Quoted 12 lines · Takashi Iwai

On Tue, 10 Jan 2017 09:45:31 +0100,

Quoted 11 lines
Quoted 11 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Tuesday, January 10, 2017 4:19 PM
To: Yang, Libin <[email protected]>
Cc: Daniel Vetter <[email protected]>; intel-gfx <[email protected]>;
Nikula, Jani <[email protected]>; [email protected]; Lin, Mengdong <[email protected]>
Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines · Libin
Quoted 4 lines

Hi Takashi,

It seems the patches for DP MST in gfx is not merged into Linus

branch.

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines

Do we have plan to merge gfx branch manually and review the patches for

audio? Or we will wait the DP MST patches for i915 merged into Linus

branch?

Quoted 39 lines
Quoted 30 lines
Quoted 12 lines
Quoted 11 lines
Quoted 7 lines

Sorry, this was delayed due to the vacation.
Now I applied these three patches to topic/hda-dp-mst branch based on 4.10- rc2, and it was merged to for-next branch.

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
topic/hda-dp- mst

Thanks. These audio patches are based on the i915 dp mst patches. Without
I915 driver patches support, it will make errors.

Quoted 5 lines

Ah yeah, I forgot it. So I removed it from for-next branch, but topic/hda-dp-mst branch is kept so that it can be merged to i915 tree.

Let me know if there is any i915 branch I can pull into sound tree.

Aw, I didn't know that the depency goes this way round, the dp mst patches (I'm not even sure which ones they are) on the i915 are just on the general pile. So not anywhere near a place where I can make a topic branch.

I guess what needs to be done now is a cherry-picked list of just the patches we need, on top of -rc3, that I can then pull into drm-intel.git plus send a pull request for that to Takashi. That means the patches are twice in drm-intel.git, but if we cherry-pick reference them correctly then that should be all ok and can't really be helped.

Quoted 2 lines

Or we just delay the audio side for 4.12, dp mst audio support is 4 years late anyway, so one more release won'thurt that much ;-)

Well, thinking of the amount of patches, I guess we can do other way
round: basically it's fine to apply Libin's latest patches to drm tree for 4.11, if it makes things easier. I don't think we'll have a big conflict with these changes for others during 4.11 development. If any, I can pull some of stable point from drm tree.

Quoted 4 lines

Does it work for you? If yes, feel free to apply these three sound patches to drm or i915 tree with my ack.

Works for me too. Libin, can you pls resend (somehow this thread disconnected from the patches for me), with Takashi's r-b + ack for merging through drm-intel?

Quoted 5 lines

Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx