From: Greg Kroah-Hartman Date: Wed, 6 Apr 2022 12:25:44 +0000 (+0200) Subject: drop asoc-sof-intel-hda-remove-link-assignment-limitation.patch X-Git-Tag: v5.17.2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62e6d907ff8cd1ab5e2f6658d3c06ae8c66c5909;p=thirdparty%2Fkernel%2Fstable-queue.git drop asoc-sof-intel-hda-remove-link-assignment-limitation.patch from 5.4, 5.10, 5.15, and 5.16 queues --- 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 index 711be55fd93..00000000000 --- a/queue-5.10/asoc-sof-intel-hda-remove-link-assignment-limitation.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 23c7144bf867298e4ac8f90ef2ea3fbc709b738a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 28 Jan 2022 15:00:17 +0200 -Subject: ASoC: SOF: Intel: hda: Remove link assignment limitation - -From: Ranjani Sridharan - -[ 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 -Reviewed-by: Pierre-Louis Bossart -Reviewed-by: Rander Wang -Reviewed-by: Kai Vehmanen -Reviewed-by: Peter Ujfalusi -Signed-off-by: Peter Ujfalusi -Link: https://lore.kernel.org/r/20220128130017.28508-1-peter.ujfalusi@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - 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 - diff --git a/queue-5.10/series b/queue-5.10/series index aac63b6988d..0d170c90f30 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -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 index 1b495132861..00000000000 --- a/queue-5.15/asoc-sof-intel-hda-remove-link-assignment-limitation.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 94d62884ffd8cdb9355e036e591044086a544b23 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 28 Jan 2022 15:00:17 +0200 -Subject: ASoC: SOF: Intel: hda: Remove link assignment limitation - -From: Ranjani Sridharan - -[ 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 -Reviewed-by: Pierre-Louis Bossart -Reviewed-by: Rander Wang -Reviewed-by: Kai Vehmanen -Reviewed-by: Peter Ujfalusi -Signed-off-by: Peter Ujfalusi -Link: https://lore.kernel.org/r/20220128130017.28508-1-peter.ujfalusi@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - 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 - diff --git a/queue-5.15/series b/queue-5.15/series index a97d46c172d..7742ca1d9da 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -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 index 8b2a93e58c7..00000000000 --- a/queue-5.16/asoc-sof-intel-hda-remove-link-assignment-limitation.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 94a93942b75fe96b2cd8f9498befcd25294f9eb6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 28 Jan 2022 15:00:17 +0200 -Subject: ASoC: SOF: Intel: hda: Remove link assignment limitation - -From: Ranjani Sridharan - -[ 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 -Reviewed-by: Pierre-Louis Bossart -Reviewed-by: Rander Wang -Reviewed-by: Kai Vehmanen -Reviewed-by: Peter Ujfalusi -Signed-off-by: Peter Ujfalusi -Link: https://lore.kernel.org/r/20220128130017.28508-1-peter.ujfalusi@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - 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 - diff --git a/queue-5.16/series b/queue-5.16/series index 7ebd3e8177e..1c56be154a4 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -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 index 899d3844ed4..00000000000 --- a/queue-5.4/asoc-sof-intel-hda-remove-link-assignment-limitation.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8319c63d1b7dc5a35593acf0705a801ffd148d21 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 28 Jan 2022 15:00:17 +0200 -Subject: ASoC: SOF: Intel: hda: Remove link assignment limitation - -From: Ranjani Sridharan - -[ 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 -Reviewed-by: Pierre-Louis Bossart -Reviewed-by: Rander Wang -Reviewed-by: Kai Vehmanen -Reviewed-by: Peter Ujfalusi -Signed-off-by: Peter Ujfalusi -Link: https://lore.kernel.org/r/20220128130017.28508-1-peter.ujfalusi@linux.intel.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - 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 - diff --git a/queue-5.4/series b/queue-5.4/series index 15e1adcab4f..25fa3a26da1 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -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