Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora

2 files changed, 3 insertions, 145 deletions

diff --git a/alsa-5.5.patch b/alsa-5.5.patch
index 350d0a186..7310b2d05 100644
--- a/alsa-5.5.patch
+++ b/alsa-5.5.patch
@@ -7408,113 +7408,6 @@ index 003879401d63..3cf2e0f39d94 100644
 2.20.1
 
 
-From 145c89d929bcdf53b50c6528997bfc2595883513 Mon Sep 17 00:00:00 2001
-From: Keyon Jie <yang.jie@linux.intel.com>
-Date: Fri, 25 Oct 2019 17:40:57 -0500
-Subject: [PATCH 072/130] ASoC: SOF: add a field to store the current D0
- substate of DSP
-
-Add field d0_substate to struct snd_sof_dev to store the current DSP
-D0 sub-state(only meaningful when DSP in D0), which could be D0I0 or
-D0I3.
-
-Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/20191025224122.7718-2-pierre-louis.bossart@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit 4c19030c511fd6eab029bae838f736256d2f43cd)
-Bugzilla: 1772498
----
- sound/soc/sof/sof-priv.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
-index 2d40de5ee285..481dfe4ee2d0 100644
---- a/sound/soc/sof/sof-priv.h
-+++ b/sound/soc/sof/sof-priv.h
-@@ -68,6 +68,12 @@ extern int sof_core_debug;
- 
- #define DMA_CHAN_INVALID	0xFFFFFFFF
- 
-+/* DSP D0ix sub-state */
-+enum sof_d0_substate {
-+	SOF_DSP_D0I0 = 0,	/* DSP default D0 substate */
-+	SOF_DSP_D0I3,		/* DSP D0i3(low power) substate*/
-+};
-+
- struct snd_sof_dev;
- struct snd_sof_ipc_msg;
- struct snd_sof_ipc;
-@@ -387,6 +393,9 @@ struct snd_sof_dev {
- 	 */
- 	struct snd_soc_component_driver plat_drv;
- 
-+	/* power states related */
-+	enum sof_d0_substate d0_substate;
-+
- 	/* DSP firmware boot */
- 	wait_queue_head_t boot_wait;
- 	u32 boot_complete;
--- 
-2.20.1
-
-
-From b5d42bad1c65b0b71c7a1115a9d50f25a24c2351 Mon Sep 17 00:00:00 2001
-From: Keyon Jie <yang.jie@linux.intel.com>
-Date: Fri, 25 Oct 2019 17:40:58 -0500
-Subject: [PATCH 073/130] ASoC: SOF: reset default d0_substate at probe() and
- resume()
-
-We initialize/reset d0_substate to default d0i0 value when doing
-transition D3-->D0, e.g. at success of probing and resuming.
-
-Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/20191025224122.7718-3-pierre-louis.bossart@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit 09fe6b528886c0d07ce539b837749edcc46618d0)
-Bugzilla: 1772498
----
- sound/soc/sof/core.c | 3 +++
- sound/soc/sof/pm.c   | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
-index 5998861a9002..8661c2cca76b 100644
---- a/sound/soc/sof/core.c
-+++ b/sound/soc/sof/core.c
-@@ -458,6 +458,9 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)
- 	/* initialize sof device */
- 	sdev->dev = dev;
- 
-+	/* initialize default D0 sub-state */
-+	sdev->d0_substate = SOF_DSP_D0I0;
-+
- 	sdev->pdata = plat_data;
- 	sdev->first_boot = true;
- 	dev_set_drvdata(dev, sdev);
-diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
-index e23beaeefe00..81e623dfc7e5 100644
---- a/sound/soc/sof/pm.c
-+++ b/sound/soc/sof/pm.c
-@@ -326,6 +326,9 @@ static int sof_resume(struct device *dev, bool runtime_resume)
- 			"error: ctx_restore ipc error during resume %d\n",
- 			ret);
- 
-+	/* initialize default D0 sub-state */
-+	sdev->d0_substate = SOF_DSP_D0I0;
-+
- 	return ret;
- }
- 
--- 
-2.20.1
-
-
 From 3cf1bbbb4506efc80e8066c4d40e92264f26eec7 Mon Sep 17 00:00:00 2001
 From: Keyon Jie <yang.jie@linux.intel.com>
 Date: Fri, 25 Oct 2019 17:40:59 -0500
@@ -8481,44 +8374,6 @@ index 5a089efc0e4c..5ad73a34b09c 100644
 2.20.1
 
 
-From 8bb4306ead5641b1f9e7d97d0db0d5705b193e79 Mon Sep 17 00:00:00 2001
-From: Keyon Jie <yang.jie@linux.intel.com>
-Date: Fri, 25 Oct 2019 17:41:15 -0500
-Subject: [PATCH 089/130] ASoC: SOF: add a flag to indicate the system suspend
- target
-
-Add flag 's0_suspend' to indicate if the system is entering S0ix or
-not.
-
-Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/20191025224122.7718-20-pierre-louis.bossart@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit 7367d3096b1443e55a2c730d1966f423b15d5cad)
-Bugzilla: 1772498
----
- sound/soc/sof/sof-priv.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
-index 2231c673c678..e715673f20e5 100644
---- a/sound/soc/sof/sof-priv.h
-+++ b/sound/soc/sof/sof-priv.h
-@@ -398,6 +398,8 @@ struct snd_sof_dev {
- 
- 	/* power states related */
- 	enum sof_d0_substate d0_substate;
-+	/* flag to track if the intended power target of suspend is S0ix */
-+	bool s0_suspend;
- 
- 	/* DSP firmware boot */
- 	wait_queue_head_t boot_wait;
--- 
-2.20.1
-
-
 From 8d8d925e7051604e82ef12a2dbddf5d77e02e40d Mon Sep 17 00:00:00 2001
 From: Keyon Jie <yang.jie@linux.intel.com>
 Date: Fri, 25 Oct 2019 17:41:16 -0500
diff --git a/kernel.spec b/kernel.spec
index c17a2de55..21660146e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2538,6 +2538,9 @@ fi
 #
 #
 %changelog
+* Tue Feb 11 2020 Jeremy Cline <jcline@redhat.com> - 5.4.19-200
+- Linux v5.4.19
+
 * Mon Feb 10 2020 Jeremy Cline <jcline@redhat.com>
 - Remove sysrq support to lift lockdown (rhbz 1800859)