From b88c0a12609f0e53bbdd4d1bf62e7831590a1a27 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 30 Dec 2019 15:03:26 +0100 Subject: [PATCH] drop alsa-hda-hdmi-implement-mst_no_extra_pcms-flag.patch from 5.4 --- ...dmi-implement-mst_no_extra_pcms-flag.patch | 92 ------------------- queue-5.4/series | 1 - 2 files changed, 93 deletions(-) delete mode 100644 queue-5.4/alsa-hda-hdmi-implement-mst_no_extra_pcms-flag.patch diff --git a/queue-5.4/alsa-hda-hdmi-implement-mst_no_extra_pcms-flag.patch b/queue-5.4/alsa-hda-hdmi-implement-mst_no_extra_pcms-flag.patch deleted file mode 100644 index ea2917e405c..00000000000 --- a/queue-5.4/alsa-hda-hdmi-implement-mst_no_extra_pcms-flag.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 45eda6ce5a2caa04812f2fdfa55fb44d7cd69855 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 29 Oct 2019 15:40:09 +0200 -Subject: ALSA: hda/hdmi - implement mst_no_extra_pcms flag - -From: Kai Vehmanen - -[ Upstream commit 2a2edfbbfee47947dd05f5860c66c0e80ee5e09d ] - -To support the DP-MST multiple streams via single connector feature, -the HDMI driver was extended with the concept of backup PCMs. See -commit 9152085defb6 ("ALSA: hda - add DP MST audio support"). - -This implementation works fine with snd_hda_intel.c as PCM topology -is fully managed within the single driver. - -When the HDA codec driver is used from ASoC components, the concept -of backup PCMs no longer fits. For ASoC topologies, the physical -HDMI converters are presented as backend DAIs and these should match -with hardware capabilities. The ASoC topology may define arbitrary -PCMs (i.e. frontend DAIs) and have processing elements before eventual -routing to the HDMI BE DAIs. With backup PCMs, the link between -FE and BE DAIs would become dynamic and change when monitors are -(un)plugged. This would lead to modifying the topology every time -hotplug events happen, which is not currently possible in ASoC and -there does not seem to be any obvious benefits from this design. - -To overcome above problems and enable the HDMI driver to be used -from ASoC, this patch adds a new mode (mst_no_extra_pcms flags) to -patch_hdmi.c. In this mode, the codec driver does not assume -the backup PCMs to be created. - -Signed-off-by: Kai Vehmanen -Reviewed-by: Takashi Iwai -Reviewed-by: Pierre-Louis Bossart -Link: https://lore.kernel.org/r/20191029134017.18901-2-kai.vehmanen@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - include/sound/hda_codec.h | 1 + - sound/pci/hda/patch_hdmi.c | 19 ++++++++++++++----- - 2 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h -index 9a0393cf024c..ac18f428eda6 100644 ---- a/include/sound/hda_codec.h -+++ b/include/sound/hda_codec.h -@@ -254,6 +254,7 @@ struct hda_codec { - unsigned int force_pin_prefix:1; /* Add location prefix */ - unsigned int link_down_at_suspend:1; /* link down at runtime suspend */ - unsigned int relaxed_resume:1; /* don't resume forcibly for jack */ -+ unsigned int mst_no_extra_pcms:1; /* no backup PCMs for DP-MST */ - - #ifdef CONFIG_PM - unsigned long power_on_acct; -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 488c17c9f375..74f809b6fa31 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -2082,15 +2082,24 @@ static bool is_hdmi_pcm_attached(struct hdac_device *hdac, int pcm_idx) - static int generic_hdmi_build_pcms(struct hda_codec *codec) - { - struct hdmi_spec *spec = codec->spec; -- int idx; -+ int idx, pcm_num; - - /* - * for non-mst mode, pcm number is the same as before -- * for DP MST mode, pcm number is (nid number + dev_num - 1) -- * dev_num is the device entry number in a pin -- * -+ * for DP MST mode without extra PCM, pcm number is same -+ * for DP MST mode with extra PCMs, pcm number is -+ * (nid number + dev_num - 1) -+ * dev_num is the device entry number in a pin - */ -- for (idx = 0; idx < spec->num_nids + spec->dev_num - 1; idx++) { -+ -+ if (codec->mst_no_extra_pcms) -+ pcm_num = spec->num_nids; -+ else -+ pcm_num = spec->num_nids + spec->dev_num - 1; -+ -+ codec_dbg(codec, "hdmi: pcm_num set to %d\n", pcm_num); -+ -+ for (idx = 0; idx < pcm_num; idx++) { - struct hda_pcm *info; - struct hda_pcm_stream *pstr; - --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 5e8fa4b079b..ffd360ba253 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -203,7 +203,6 @@ rdma-core-set-dma-parameters-correctly.patch staging-wilc1000-check-if-device-is-initialzied-befo.patch gpu-host1x-allocate-gather-copy-for-host1x.patch net-dsa-lan9303-select-regmap-when-lan9303-enable.patch -alsa-hda-hdmi-implement-mst_no_extra_pcms-flag.patch phy-renesas-phy-rcar-gen2-fix-the-array-off-by-one-w.patch phy-qcom-usb-hs-fix-extcon-double-register-after-pow.patch s390-time-ensure-get_clock_monotonic-returns-monoton.patch -- 2.47.3