5.9.1

8 files changed, 154 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9b51eb0635c..e663f12b8ab5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-g14
 	pkgdesc = Linux
-	pkgver = 5.8.12.arch1
-	pkgrel = 2
+	pkgver = 5.9.1.arch1
+	pkgrel = 1
 	url = https://lab.retarded.farm/zappel/asus-rog-zephyrus-g14/
 	arch = x86_64
 	license = GPL2
@@ -12,29 +12,27 @@ pkgbase = linux-g14
 	makedepends = xmlto
 	makedepends = git
 	options = !strip
-	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.8.12-arch1
+	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.9.1-arch1
 	source = config
 	source = sphinx-workaround.patch
-	source = sys-kernel_arch-sources-g14_files_0001-nonupstream-navi10-vfio-reset.patch
 	source = sys-kernel_arch-sources-g14_files_0002-asus-nb-wmi-add-support-for-GU502DU.patch
 	source = sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch
 	source = sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch
-	source = sys-kernel_arch-sources-g14_files_0007-snd-hda-realtek-g401-ga502.patch
 	source = sys-kernel_arch-sources-g14_files_6002-amdgpu-dm-kernel-5.8.patch
-	source = sys-kernel_arch-sources-g14_files_6003-vboxdrv-glp.patch
+	source = sys-kernel_arch-sources-g14_files_6004-apci_d3_fix.patch
+	source = sys-kernel_arch-sources-g14_files-6005-alsa-hda-ga401-ga502-experimental.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
 	sha256sums = SKIP
 	sha256sums = 457d5c9717048cd5334ba3d14dfb37699ac1d2c6dc2fd1df93adb487d6921f2f
 	sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
-	sha256sums = 02c59a722f5d1912ba9ee4c2b5e84b079c13badc225040b834a18a42345a7a61
-	sha256sums = edf23d81eb39f38e106c6ce172600cc06d7d155a4ef578c3c94344a45a8a7858
-	sha256sums = a7b045dc36aea9b3203a4910da3f3314121672e940d7bd8a8cf0126d913e0fe3
-	sha256sums = 8ef9f603fa838cda5eec84da18f00b81f5acde9b3705717cbc4b0e7ee2e2fe8d
-	sha256sums = dc2fad922a2e557e38f63dcaeefe7cd1ba1094699f44968cc916788ba14848a3
-	sha256sums = 7063af2e6588575ee4fd20d2339850221595acd3da5d8912e6298aea57186887
-	sha256sums = e92f713d50425be96f118a7a3b9f62787453341a27ff10ac5ba394de060ccef7
+	sha256sums = e924edb045476201968eb76157a72ddae7dac18932e54f0e3d32eeed98d2b2c6
+	sha256sums = 7c9bff35d0bde9b4250137ea9e5292a103ecbc1fe68a753688541d22be27fa29
+	sha256sums = 68bf0dcc390ed14d97f48ebd1095d2587ac2eb2671445125fbcaaf7a6aa01733
+	sha256sums = af68b47b81e5d361058e3293cf3c0b266af0fcdd2d4a5fb62468793e4cb903e4
+	sha256sums = bb502b035367b57319c2cc1a74ea3e8155003984d00b189badeec9c72429f3da
+	sha256sums = b8889a48d258d801d7a0b87665eb4b6c621e711a5d0e7a7c3cb7524349e5cbfc
 
 pkgname = linux-g14
 	pkgdesc = The Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index e88c9cca45aa..64e7c506cc6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-g14
-pkgver=5.8.12.arch1
-pkgrel=2
+pkgver=5.9.1.arch1
+pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
 url="https://lab.retarded.farm/zappel/asus-rog-zephyrus-g14/"
@@ -19,14 +19,12 @@ source=(
 	"$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag"
 	config         # the main kernel config file
 	sphinx-workaround.patch
-	"sys-kernel_arch-sources-g14_files_0001-nonupstream-navi10-vfio-reset.patch"
 	"sys-kernel_arch-sources-g14_files_0002-asus-nb-wmi-add-support-for-GU502DU.patch"
-	"sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch"
+	"sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch" 
 	"sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch"
-	#"sys-kernel_arch-sources-g14_files_0006-ALSA-hda-fixup-headset-for-ASUS-GX502-laptop.patch"
-	"sys-kernel_arch-sources-g14_files_0007-snd-hda-realtek-g401-ga502.patch"
 	"sys-kernel_arch-sources-g14_files_6002-amdgpu-dm-kernel-5.8.patch"
-	"sys-kernel_arch-sources-g14_files_6003-vboxdrv-glp.patch"
+	"sys-kernel_arch-sources-g14_files_6004-apci_d3_fix.patch"
+	"sys-kernel_arch-sources-g14_files-6005-alsa-hda-ga401-ga502-experimental.patch"
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -37,13 +35,13 @@ validpgpkeys=(
 sha256sums=('SKIP'
             '457d5c9717048cd5334ba3d14dfb37699ac1d2c6dc2fd1df93adb487d6921f2f'
             '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
-            '02c59a722f5d1912ba9ee4c2b5e84b079c13badc225040b834a18a42345a7a61'
-            'edf23d81eb39f38e106c6ce172600cc06d7d155a4ef578c3c94344a45a8a7858'
-            'a7b045dc36aea9b3203a4910da3f3314121672e940d7bd8a8cf0126d913e0fe3'
-            '8ef9f603fa838cda5eec84da18f00b81f5acde9b3705717cbc4b0e7ee2e2fe8d'
-            'dc2fad922a2e557e38f63dcaeefe7cd1ba1094699f44968cc916788ba14848a3'
-            '7063af2e6588575ee4fd20d2339850221595acd3da5d8912e6298aea57186887'
-            'e92f713d50425be96f118a7a3b9f62787453341a27ff10ac5ba394de060ccef7')
+            'e924edb045476201968eb76157a72ddae7dac18932e54f0e3d32eeed98d2b2c6'
+            '7c9bff35d0bde9b4250137ea9e5292a103ecbc1fe68a753688541d22be27fa29'
+            '68bf0dcc390ed14d97f48ebd1095d2587ac2eb2671445125fbcaaf7a6aa01733'
+            'af68b47b81e5d361058e3293cf3c0b266af0fcdd2d4a5fb62468793e4cb903e4'
+            'bb502b035367b57319c2cc1a74ea3e8155003984d00b189badeec9c72429f3da'
+            'b8889a48d258d801d7a0b87665eb4b6c621e711a5d0e7a7c3cb7524349e5cbfc')
+
 
 
 
diff --git a/sys-kernel_arch-sources-g14_files-6005-alsa-hda-ga401-ga502-experimental.patch b/sys-kernel_arch-sources-g14_files-6005-alsa-hda-ga401-ga502-experimental.patch
new file mode 100644
index 000000000000..f2e5577180e9
--- /dev/null
+++ b/sys-kernel_arch-sources-g14_files-6005-alsa-hda-ga401-ga502-experimental.patch
@@ -0,0 +1,60 @@
+--- a/sound/pci/hda/patch_realtek.c	2020-10-10 19:26:27.026289289 +0200
++++ b/sound/pci/hda/patch_realtek.c	2020-10-10 19:28:24.502830780 +0200
+@@ -6235,7 +6235,9 @@
+ 	ALC269VC_FIXUP_ACER_HEADSET_MIC,
+ 	ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE,
+ 	ALC289_FIXUP_ASUS_GA401,
+-	ALC289_FIXUP_ASUS_GA502,
++	ALC289_FIXUP_ASUS_GA401_SPK,
++	ALC289_FIXUP_ASUS_GA401_HP_MIC,
++	ALC294_FIXUP_ASUS_GA502,
+ 	ALC256_FIXUP_ACER_MIC_NO_PRESENCE,
+ 	ALC285_FIXUP_HP_GPIO_AMP_INIT,
+ 	ALC269_FIXUP_CZC_B20,
+@@ -7496,14 +7498,33 @@
+ 	[ALC289_FIXUP_ASUS_GA401] = {
+ 		.type = HDA_FIXUP_PINS,
+ 		.v.pins = (const struct hda_pintbl[]) {
+-			{ 0x19, 0x03a11020 }, /* headset mic with jack detect */
++			{ 0x17, 0x90170130 }, /* bass speaker */
++			{ 0x19, 0x03a11050 }, /* headphone mic with jack detect */
++			{ 0x21, 0x03211430 }, /* headphone playback */
+ 			{ }
+ 		},
++		.chained = true,
++		.chain_id = ALC289_FIXUP_ASUS_GA401_SPK
+ 	},
+-	[ALC289_FIXUP_ASUS_GA502] = {
++	[ALC289_FIXUP_ASUS_GA401_SPK] = {
++		.type = HDA_FIXUP_FUNC,
++		.v.func = alc295_fixup_disable_dac3,
++		.chained = true,
++		.chain_id = ALC289_FIXUP_ASUS_GA401_HP_MIC
++	},
++	[ALC289_FIXUP_ASUS_GA401_HP_MIC] = {
++		.type = HDA_FIXUP_VERBS,
++		.v.verbs = (const struct hda_verb[]) {
++			// fixes mic detect after win10 reboot
++			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },
++			{ 0x20, AC_VERB_SET_PROC_COEF, 0x5289 },
++			{ }
++		},
++	},
++	[ALC294_FIXUP_ASUS_GA502] = {
+ 		.type = HDA_FIXUP_PINS,
+ 		.v.pins = (const struct hda_pintbl[]) {
+-			{ 0x19, 0x03a11020 }, /* headset mic with jack detect */
++			{ 0x19, 0x03a11050 }, /* headphone mic with jack detect */
+ 			{ }
+ 		},
+ 	},
+@@ -7806,8 +7827,8 @@
+ 	SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
+ 	SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+ 	SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),
+-	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
+ 	SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),
++	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC294_FIXUP_ASUS_GA502),
+ 	SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),
+ 	SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
+ 	SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
diff --git a/sys-kernel_arch-sources-g14_files_0002-asus-nb-wmi-add-support-for-GU502DU.patch b/sys-kernel_arch-sources-g14_files_0002-asus-nb-wmi-add-support-for-GU502DU.patch
index 978a55bf181f..d8692ffdf21f 100644
--- a/sys-kernel_arch-sources-g14_files_0002-asus-nb-wmi-add-support-for-GU502DU.patch
+++ b/sys-kernel_arch-sources-g14_files_0002-asus-nb-wmi-add-support-for-GU502DU.patch
@@ -11,7 +11,7 @@
 +			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "GA502DU"),
 +		},
-+		.driver_data = &quirk_asus_ga502i,
++		.driver_data = &quirk_asus_vendor_backlight,
 +	},
 +	{
 +		.callback = dmi_matched,
@@ -20,7 +20,7 @@
 +			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "GU502DU"),
 +		},
-+		.driver_data = &quirk_asus_ga502i,
++		.driver_data = &quirk_asus_vendor_backlight,
 +	},
  	{},
  };
diff --git a/sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch b/sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch
index 7e079c12370f..21fec0a6c507 100644
--- a/sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch
+++ b/sys-kernel_arch-sources-g14_files_0003-i8042-dmiids.patch
@@ -1,9 +1,9 @@
 diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
-index 7b08ff8ddf35..10dfd68ffb1b 100644
+index a4c9b9652560..0893ce4e5523 100644
 --- a/drivers/input/serio/i8042-x86ia64io.h
 +++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -698,6 +698,55 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
- 			DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
+@@ -728,6 +728,55 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
+ 			DMI_MATCH(DMI_BOARD_VENDOR, "PK"),
  		},
  	},
 +	{
diff --git a/sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch b/sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch
index 0a589f6c1425..5b5eb5515ac3 100644
--- a/sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch
+++ b/sys-kernel_arch-sources-g14_files_0004-hid-asus-n-key.patch
@@ -1,4 +1,7 @@
-From: Luke D Jones <luke@xxxxxxxxxx>
+From 5846c5fffd392e1158e228d05e64c0613fef4d49 Mon Sep 17 00:00:00 2001
+From: Luke D Jones <luke@ljones.dev>
+Date: Sun, 6 Sep 2020 19:30:02 +1200
+Subject: [PATCH V6] HID: ASUS: Add support for ASUS N-Key keyboard
 
 The ASUS N-Key keyboard uses the productId of 0x1866 and is used in
 almost all modern ASUS gaming laptops with slight changes to the
@@ -20,7 +23,7 @@ intitialised before such things as keyboard backlight control work.
 Misc changes in scope: update some hardcoded comparisons to use an
 available define.
 
-Signed-off-by: Luke D Jones <luke@xxxxxxxxxx>
+Signed-off-by: Luke D Jones <luke@ljones.dev>
 ---
  drivers/hid/hid-asus.c                     | 188 ++++++++++++++++++---
  drivers/hid/hid-ids.h                      |   1 +
@@ -341,3 +344,4 @@ index 897b8332a39f..05253cfe786c 100644
  /* Wireless */
 -- 
 2.26.2
+
diff --git a/sys-kernel_arch-sources-g14_files_6002-amdgpu-dm-kernel-5.8.patch b/sys-kernel_arch-sources-g14_files_6002-amdgpu-dm-kernel-5.8.patch
index 4ecc0edd2bf2..66685d33ba6a 100644
--- a/sys-kernel_arch-sources-g14_files_6002-amdgpu-dm-kernel-5.8.patch
+++ b/sys-kernel_arch-sources-g14_files_6002-amdgpu-dm-kernel-5.8.patch
@@ -8,7 +8,7 @@ index db5e0bb0d935..bfbd56e857bf 100644
  	int i;
 -	struct dmcu *dmcu = NULL;
 +	struct dmcu *dmcu = adev->dm.dc->res_pool->dmcu;;
- 	bool ret;
+ 	bool ret = true;
  
 -	if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw)
 -		return detect_mst_link_for_all_connectors(adev->ddev);
diff --git a/sys-kernel_arch-sources-g14_files_6004-apci_d3_fix.patch b/sys-kernel_arch-sources-g14_files_6004-apci_d3_fix.patch
new file mode 100644
index 000000000000..b5702a78758a
--- /dev/null
+++ b/sys-kernel_arch-sources-g14_files_6004-apci_d3_fix.patch
@@ -0,0 +1,59 @@
+Recent laptops with dual AMD GPUs fail to suspend the discrete GPU, thus
+causing lockups on system sleep and high power consumption at runtime.
+The discrete GPU would normally be suspended to D3cold by turning off
+ACPI _PR3 Power Resources of the Root Port above the GPU.
+
+However on affected systems, the Root Port is hotplug-capable and
+pci_bridge_d3_possible() only allows hotplug ports to go to D3 if they
+belong to a Thunderbolt device or if the Root Port possesses a
+"HotPlugSupportInD3" ACPI property.  Neither is the case on affected
+laptops.  The reason for whitelisting only specific, known to work
+hotplug ports for D3 is that there have been reports of SkyLake Xeon-SP
+systems raising Hardware Error NMIs upon suspending their hotplug ports:
+https://lore.kernel.org/linux-pci/20170503180426.GA4058@otc-nc-03/
+
+But if a hotplug port is power manageable by ACPI (as can be detected
+through presence of Power Resources and corresponding _PS0 and _PS3
+methods) then it ought to be safe to suspend it to D3.  To this end,
+amend acpi_pci_bridge_d3() to whitelist such ports for D3.
+
+Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1222
+Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1252
+Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1304
+Reported-and-tested-by: Arthur Borsboom <arthurborsboom at gmail.com>
+Reported-and-tested-by: matoro <matoro at airmail.cc>
+Reported-by: Aaron Zakhrov <aaron.zakhrov at gmail.com>
+Reported-by: Michal Rostecki <mrostecki at suse.com>
+Reported-by: Shai Coleman <git at shaicoleman.com>
+Signed-off-by: Lukas Wunner <lukas at wunner.de>
+Cc: stable at vger.kernel.org
+Cc: Alex Deucher <alexander.deucher at amd.com>
+Cc: Rafael J. Wysocki <rafael.j.wysocki at intel.com>
+Cc: Mika Westerberg <mika.westerberg at linux.intel.com>
+---
+ drivers/pci/pci-acpi.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
+index d5869a0..d9aa551 100644
+--- a/drivers/pci/pci-acpi.c
++++ b/drivers/pci/pci-acpi.c
+@@ -944,6 +944,16 @@ static bool acpi_pci_bridge_d3(struct pci_dev *dev)
+ 	if (!dev->is_hotplug_bridge)
+ 		return false;
+ 
++	/* Assume D3 support if the bridge is power-manageable by ACPI. */
++	adev = ACPI_COMPANION(&dev->dev);
++	if (!adev && !pci_dev_is_added(dev)) {
++		adev = acpi_pci_find_companion(&dev->dev);
++		ACPI_COMPANION_SET(&dev->dev, adev);
++	}
++
++	if (adev && acpi_device_power_manageable(adev))
++		return true;
++
+ 	/*
+ 	 * Look for a special _DSD property for the root port and if it
+ 	 * is set we know the hierarchy behind it supports D3 just fine.
+-- 
+2.27.0
\ No newline at end of file