Updated to 5.4.6

3 files changed, 2 insertions, 112 deletions

diff --git a/0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch b/0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch
deleted file mode 100644
index 07b11cc..0000000
--- a/0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 04fe3cc1f00622bf3ff356dca7f122768a14bdbc Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Sat, 14 Dec 2019 18:52:17 +0100
-Subject: ALSA: hda: Fix regression by strip mask fix
-
-The commit e38e486d66e2 ("ALSA: hda: Modify stream stripe mask only
-when needed") tried to address the regression by the unconditional
-application of the stripe mask, but this caused yet another
-regression for the previously working devices.  Namely, the patch
-clears the azx_dev->stripe flag at snd_hdac_stream_clear(), but this
-may be called multiple times before restarting the stream, so this
-ended up with clearance of the flag for the whole time.
-
-This patch fixes the regression by moving the azx_dev->stripe flag
-clearance at the counter-part, the close callback of HDMI codec
-driver instead.
-
-Fixes: e38e486d66e2 ("ALSA: hda: Modify stream stripe mask only when needed")
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=205855
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204477
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/20191214175217.31852-1-tiwai@suse.de
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- sound/hda/hdac_stream.c    | 4 +---
- sound/pci/hda/patch_hdmi.c | 2 ++
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c
-index f9707fb05efe..682ed39f79b0 100644
---- a/sound/hda/hdac_stream.c
-+++ b/sound/hda/hdac_stream.c
-@@ -120,10 +120,8 @@ void snd_hdac_stream_clear(struct hdac_stream *azx_dev)
- 	snd_hdac_stream_updateb(azx_dev, SD_CTL,
- 				SD_CTL_DMA_START | SD_INT_MASK, 0);
- 	snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
--	if (azx_dev->stripe) {
-+	if (azx_dev->stripe)
- 		snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0);
--		azx_dev->stripe = 0;
--	}
- 	azx_dev->running = false;
- }
- EXPORT_SYMBOL_GPL(snd_hdac_stream_clear);
-diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
-index 4dafc864d765..488c17c9f375 100644
---- a/sound/pci/hda/patch_hdmi.c
-+++ b/sound/pci/hda/patch_hdmi.c
-@@ -1983,6 +1983,8 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
- 		per_cvt->assigned = 0;
- 		hinfo->nid = 0;
- 
-+		azx_stream(get_azx_dev(substream))->stripe = 0;
-+
- 		mutex_lock(&spec->pcm_lock);
- 		snd_hda_spdif_ctls_unassign(codec, pcm_idx);
- 		clear_bit(pcm_idx, &spec->pcm_in_use);
--- 
-cgit v1.2.1-1-g437b
-
diff --git a/0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk+.patch b/0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk+.patch
deleted file mode 100644
index d88f33e..0000000
--- a/0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk+.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1960609cc201fd1c99c17cade6956de06b3d3856 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
-Date: Wed, 27 Nov 2019 22:12:09 +0200
-Subject: drm/i915/fbc: Disable fbc by default on all glk+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We're missing a workaround in the fbc code for all glk+ platforms
-which can cause corruption around the top of the screen. So
-enabling fbc by default is a bad idea. I'm not keen to backport
-the w/a so let's start by disabling fbc by default on all glk+.
-We'll lift the restriction once the w/a is in place.
-
-Cc: stable@vger.kernel.org
-Cc: Daniel Drake <drake@endlessm.com>
-Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
-Cc: Jian-Hong Pan <jian-hong@endlessm.com>
-Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20191127201222.16669-2-ville.syrjala@linux.intel.com
-Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-(cherry picked from commit cd8c021b36a66833cefe2c90a79a9e312a2a5690)
-Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
----
- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
-index 16ed44bfd734..07a038f21619 100644
---- a/drivers/gpu/drm/i915/display/intel_fbc.c
-+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
-@@ -1284,7 +1284,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *dev_priv)
- 		return 0;
- 
- 	/* https://bugs.freedesktop.org/show_bug.cgi?id=108085 */
--	if (IS_GEMINILAKE(dev_priv))
-+	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
- 		return 0;
- 
- 	if (IS_BROADWELL(dev_priv) || INTEL_GEN(dev_priv) >= 9)
--- 
-cgit v1.2.1-1-g437b
-
diff --git a/PKGBUILD b/PKGBUILD
index c80e4ba..4f481c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 pkgbase=linux-libre
 _supver=5
 _majver=4
-_minver=5
+_minver=6
 _gccpatchver='20190822'
   if [ "$_minver" == "0" ]; then
     pkgver=${_supver}.${_majver}
@@ -42,8 +42,6 @@ source=(
   0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
   0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
   0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
-  0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch
-  0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk+.patch
   graysky_bdver2-hotfix.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
   ath9k-regdom-hack.patch
@@ -55,7 +53,7 @@ validpgpkeys=(
 )
 sha256sums=('d56d4db5a539058382b500c9d8ebec1f76964647220eb3ed107f49c9dabecbab'
             'SKIP'
-            'afe4b9970740188a445ecf85ace1732ef0d53072771d6cb284b0e65e4058991e'
+            '0f991063d3dfe3b04eb89e92a36e207d5f4da1e525fd71ef8a2d3b22f143d94b'
             'SKIP'
             'e862ecd2cb0b20e1859ec3e47616457a9a3acb111cd5a86094f9ed1dbd7f42ac'
             '6fd45ccc07747f177b83550d397c16f8c32fa49985eab790be9792bcb0adf8fd'
@@ -63,8 +61,6 @@ sha256sums=('d56d4db5a539058382b500c9d8ebec1f76964647220eb3ed107f49c9dabecbab'
             '5c783631f63bb87f8f8a7b98d4fc5eb2a650a4c101e877f0b58815f2538ec481'
             '657fd313fb16cb6a6ce6cff4bc6ad96069b500514e6998442aed95573ab4083a'
             '25d72c2c88088d78afa1658fc16c8d4ad98f4140ec69fa0ade49abfe27e8f722'
-            '4e8a9a6757d7ebea8352b8f7b26f007d6c370ea83f67b83f1f49fa54cc52b4c9'
-            '739eb4dfefbc01d57419be4dcb6331b219c52185df36907fd82cfdcb036d927f'
             'c5405139aa0a90a6f68f6a13e066a2bd0600c970f9f525cd3aa114b044a7f73b'
             '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
@@ -93,8 +89,6 @@ prepare() {
   patch -p1 -i ../0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
   patch -p1 -i ../0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
   patch -p1 -i ../0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
-  patch -p1 -i ../0007-ALSA-hda-Fix-regression-by-strip-mask-fix.patch
-  patch -p1 -i ../0008-drm-i915-fbc-Disable-fbc-by-default-on-all-glk+.patch
 
 
   # graysky gcc hotfixes