]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop asoc-sof-intel-hda-remove-link-assignment-limitation.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Apr 2022 12:25:44 +0000 (14:25 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Apr 2022 12:25:44 +0000 (14:25 +0200)
from 5.4, 5.10, 5.15, and 5.16 queues

queue-5.10/asoc-sof-intel-hda-remove-link-assignment-limitation.patch [deleted file]
queue-5.10/series
queue-5.15/asoc-sof-intel-hda-remove-link-assignment-limitation.patch [deleted file]
queue-5.15/series
queue-5.16/asoc-sof-intel-hda-remove-link-assignment-limitation.patch [deleted file]
queue-5.16/series
queue-5.4/asoc-sof-intel-hda-remove-link-assignment-limitation.patch [deleted file]
queue-5.4/series

diff --git a/queue-5.10/asoc-sof-intel-hda-remove-link-assignment-limitation.patch b/queue-5.10/asoc-sof-intel-hda-remove-link-assignment-limitation.patch
deleted file mode 100644 (file)
index 711be55..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 23c7144bf867298e4ac8f90ef2ea3fbc709b738a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 28 Jan 2022 15:00:17 +0200
-Subject: ASoC: SOF: Intel: hda: Remove link assignment limitation
-
-From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-
-[ Upstream commit 2ce0d008dcc59f9c01f43277b9f9743af7b01dad ]
-
-The limitation to assign a link DMA channel for a BE iff the
-corresponding host DMA channel is assigned to a connected FE is only
-applicable if the PROCEN_FMT_QUIRK is set. So, remove it for platforms
-that do not enable the quirk.
-
-Complements: a792bfc1c2bc ("ASoC: SOF: Intel: hda-stream: limit PROCEN workaround")
-Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Reviewed-by: Rander Wang <rander.wang@intel.com>
-Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Link: https://lore.kernel.org/r/20220128130017.28508-1-peter.ujfalusi@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/sof/intel/hda-dai.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
-index ef316311e959..99e62cb3a051 100644
---- a/sound/soc/sof/intel/hda-dai.c
-+++ b/sound/soc/sof/intel/hda-dai.c
-@@ -58,6 +58,8 @@ static struct hdac_ext_stream *
- {
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct sof_intel_hda_stream *hda_stream;
-+      const struct sof_intel_dsp_desc *chip;
-+      struct snd_sof_dev *sdev;
-       struct hdac_ext_stream *res = NULL;
-       struct hdac_stream *stream = NULL;
-@@ -76,9 +78,20 @@ static struct hdac_ext_stream *
-                       continue;
-               hda_stream = hstream_to_sof_hda_stream(hstream);
-+              sdev = hda_stream->sdev;
-+              chip = get_chip_info(sdev->pdata);
-               /* check if link is available */
-               if (!hstream->link_locked) {
-+                      /*
-+                       * choose the first available link for platforms that do not have the
-+                       * PROCEN_FMT_QUIRK set.
-+                       */
-+                      if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) {
-+                              res = hstream;
-+                              break;
-+                      }
-+
-                       if (stream->opened) {
-                               /*
-                                * check if the stream tag matches the stream
--- 
-2.34.1
-
index aac63b6988d697793f92a83e760eb8ffb16e902f..0d170c90f301fc5eb66afdc4922a871c048ecf6e 100644 (file)
@@ -478,7 +478,6 @@ media-staging-media-zoran-move-videodev-alloc.patch
 media-staging-media-zoran-calculate-the-right-buffer.patch
 media-staging-media-zoran-fix-various-v4l2-complianc.patch
 media-ir_toy-free-before-error-exiting.patch
-asoc-sof-intel-hda-remove-link-assignment-limitation.patch
 video-fbdev-nvidiafb-use-strscpy-to-prevent-buffer-o.patch
 video-fbdev-w100fb-reset-global-state.patch
 video-fbdev-cirrusfb-check-pixclock-to-avoid-divide-.patch
diff --git a/queue-5.15/asoc-sof-intel-hda-remove-link-assignment-limitation.patch b/queue-5.15/asoc-sof-intel-hda-remove-link-assignment-limitation.patch
deleted file mode 100644 (file)
index 1b49513..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 94d62884ffd8cdb9355e036e591044086a544b23 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 28 Jan 2022 15:00:17 +0200
-Subject: ASoC: SOF: Intel: hda: Remove link assignment limitation
-
-From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-
-[ Upstream commit 2ce0d008dcc59f9c01f43277b9f9743af7b01dad ]
-
-The limitation to assign a link DMA channel for a BE iff the
-corresponding host DMA channel is assigned to a connected FE is only
-applicable if the PROCEN_FMT_QUIRK is set. So, remove it for platforms
-that do not enable the quirk.
-
-Complements: a792bfc1c2bc ("ASoC: SOF: Intel: hda-stream: limit PROCEN workaround")
-Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Reviewed-by: Rander Wang <rander.wang@intel.com>
-Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Link: https://lore.kernel.org/r/20220128130017.28508-1-peter.ujfalusi@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/sof/intel/hda-dai.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
-index 6704dbcd101c..d15ca2564dbe 100644
---- a/sound/soc/sof/intel/hda-dai.c
-+++ b/sound/soc/sof/intel/hda-dai.c
-@@ -58,6 +58,8 @@ static struct hdac_ext_stream *
- {
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct sof_intel_hda_stream *hda_stream;
-+      const struct sof_intel_dsp_desc *chip;
-+      struct snd_sof_dev *sdev;
-       struct hdac_ext_stream *res = NULL;
-       struct hdac_stream *stream = NULL;
-@@ -76,9 +78,20 @@ static struct hdac_ext_stream *
-                       continue;
-               hda_stream = hstream_to_sof_hda_stream(hstream);
-+              sdev = hda_stream->sdev;
-+              chip = get_chip_info(sdev->pdata);
-               /* check if link is available */
-               if (!hstream->link_locked) {
-+                      /*
-+                       * choose the first available link for platforms that do not have the
-+                       * PROCEN_FMT_QUIRK set.
-+                       */
-+                      if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) {
-+                              res = hstream;
-+                              break;
-+                      }
-+
-                       if (stream->opened) {
-                               /*
-                                * check if the stream tag matches the stream
--- 
-2.34.1
-
index a97d46c172d581d4a92e262535a13940a3300395..7742ca1d9da6a7a2da33e0fd716fd380b31cfa5e 100644 (file)
@@ -729,7 +729,6 @@ media-ir_toy-free-before-error-exiting.patch
 asoc-sh-rz-ssi-make-the-data-structures-available-be.patch
 asoc-sof-intel-match-sdw-version-on-link_slaves_foun.patch
 media-imx-jpeg-prevent-decoding-nv12m-jpegs-into-sin.patch
-asoc-sof-intel-hda-remove-link-assignment-limitation.patch
 media-iommu-mediatek-v1-free-the-existed-fwspec-if-t.patch
 media-iommu-mediatek-return-enodev-if-the-device-is-.patch
 media-iommu-mediatek-add-device_link-between-the-con.patch
diff --git a/queue-5.16/asoc-sof-intel-hda-remove-link-assignment-limitation.patch b/queue-5.16/asoc-sof-intel-hda-remove-link-assignment-limitation.patch
deleted file mode 100644 (file)
index 8b2a93e..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 94a93942b75fe96b2cd8f9498befcd25294f9eb6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 28 Jan 2022 15:00:17 +0200
-Subject: ASoC: SOF: Intel: hda: Remove link assignment limitation
-
-From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-
-[ Upstream commit 2ce0d008dcc59f9c01f43277b9f9743af7b01dad ]
-
-The limitation to assign a link DMA channel for a BE iff the
-corresponding host DMA channel is assigned to a connected FE is only
-applicable if the PROCEN_FMT_QUIRK is set. So, remove it for platforms
-that do not enable the quirk.
-
-Complements: a792bfc1c2bc ("ASoC: SOF: Intel: hda-stream: limit PROCEN workaround")
-Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Reviewed-by: Rander Wang <rander.wang@intel.com>
-Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Link: https://lore.kernel.org/r/20220128130017.28508-1-peter.ujfalusi@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/sof/intel/hda-dai.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
-index 76579383d290..1b7ba7f3e99b 100644
---- a/sound/soc/sof/intel/hda-dai.c
-+++ b/sound/soc/sof/intel/hda-dai.c
-@@ -62,6 +62,8 @@ static struct hdac_ext_stream *
- {
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct sof_intel_hda_stream *hda_stream;
-+      const struct sof_intel_dsp_desc *chip;
-+      struct snd_sof_dev *sdev;
-       struct hdac_ext_stream *res = NULL;
-       struct hdac_stream *stream = NULL;
-@@ -80,9 +82,20 @@ static struct hdac_ext_stream *
-                       continue;
-               hda_stream = hstream_to_sof_hda_stream(hstream);
-+              sdev = hda_stream->sdev;
-+              chip = get_chip_info(sdev->pdata);
-               /* check if link is available */
-               if (!hstream->link_locked) {
-+                      /*
-+                       * choose the first available link for platforms that do not have the
-+                       * PROCEN_FMT_QUIRK set.
-+                       */
-+                      if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) {
-+                              res = hstream;
-+                              break;
-+                      }
-+
-                       if (stream->opened) {
-                               /*
-                                * check if the stream tag matches the stream
--- 
-2.34.1
-
index 7ebd3e8177ecadbb356ac58f5a5d9894523dc94f..1c56be154a45345047117946669cbd39e43d21c9 100644 (file)
@@ -808,7 +808,6 @@ asoc-sh-rz-ssi-make-the-data-structures-available-be.patch
 asoc-cs42l42-report-full-jack-status-when-plug-is-de.patch
 asoc-sof-intel-match-sdw-version-on-link_slaves_foun.patch
 media-imx-jpeg-prevent-decoding-nv12m-jpegs-into-sin.patch
-asoc-sof-intel-hda-remove-link-assignment-limitation.patch
 media-iommu-mediatek-v1-free-the-existed-fwspec-if-t.patch
 media-iommu-mediatek-return-enodev-if-the-device-is-.patch
 media-iommu-mediatek-add-device_link-between-the-con.patch
diff --git a/queue-5.4/asoc-sof-intel-hda-remove-link-assignment-limitation.patch b/queue-5.4/asoc-sof-intel-hda-remove-link-assignment-limitation.patch
deleted file mode 100644 (file)
index 899d384..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 8319c63d1b7dc5a35593acf0705a801ffd148d21 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 28 Jan 2022 15:00:17 +0200
-Subject: ASoC: SOF: Intel: hda: Remove link assignment limitation
-
-From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-
-[ Upstream commit 2ce0d008dcc59f9c01f43277b9f9743af7b01dad ]
-
-The limitation to assign a link DMA channel for a BE iff the
-corresponding host DMA channel is assigned to a connected FE is only
-applicable if the PROCEN_FMT_QUIRK is set. So, remove it for platforms
-that do not enable the quirk.
-
-Complements: a792bfc1c2bc ("ASoC: SOF: Intel: hda-stream: limit PROCEN workaround")
-Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Reviewed-by: Rander Wang <rander.wang@intel.com>
-Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Link: https://lore.kernel.org/r/20220128130017.28508-1-peter.ujfalusi@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/sof/intel/hda-dai.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
-index b3cdd10c83ae..80e3a02e629f 100644
---- a/sound/soc/sof/intel/hda-dai.c
-+++ b/sound/soc/sof/intel/hda-dai.c
-@@ -57,6 +57,8 @@ static struct hdac_ext_stream *
- {
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct sof_intel_hda_stream *hda_stream;
-+      const struct sof_intel_dsp_desc *chip;
-+      struct snd_sof_dev *sdev;
-       struct hdac_ext_stream *res = NULL;
-       struct hdac_stream *stream = NULL;
-@@ -75,9 +77,20 @@ static struct hdac_ext_stream *
-                       continue;
-               hda_stream = hstream_to_sof_hda_stream(hstream);
-+              sdev = hda_stream->sdev;
-+              chip = get_chip_info(sdev->pdata);
-               /* check if link is available */
-               if (!hstream->link_locked) {
-+                      /*
-+                       * choose the first available link for platforms that do not have the
-+                       * PROCEN_FMT_QUIRK set.
-+                       */
-+                      if (!(chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK)) {
-+                              res = hstream;
-+                              break;
-+                      }
-+
-                       if (stream->opened) {
-                               /*
-                                * check if the stream tag matches the stream
--- 
-2.34.1
-
index 15e1adcab4f74dd050dbe5c295c24cf7f11dc60e..25fa3a26da18943629698773572784e8e4cc8fce 100644 (file)
@@ -288,7 +288,6 @@ pm-core-keep-irq-flags-in-device_pm_check_callbacks.patch
 spi-tegra20-use-of_device_get_match_data.patch
 ext4-don-t-bug-if-someone-dirty-pages-without-asking.patch
 ntfs-add-sanity-check-on-allocation-size.patch
-asoc-sof-intel-hda-remove-link-assignment-limitation.patch
 video-fbdev-nvidiafb-use-strscpy-to-prevent-buffer-o.patch
 video-fbdev-w100fb-reset-global-state.patch
 video-fbdev-cirrusfb-check-pixclock-to-avoid-divide-.patch