linux-vfio: upgpkg 6.2.6.arch1; update patches

4 files changed, 29 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8de0576c7168..868f83fc7ea0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-vfio
 	pkgdesc = Linux
-	pkgver = 6.2.5.arch1
+	pkgver = 6.2.6.arch1
 	pkgrel = 1
-	url = https://github.com/archlinux/linux/commits/v6.2.5-arch1
+	url = https://github.com/archlinux/linux/commits/v6.2.6-arch1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -19,7 +19,7 @@ pkgbase = linux-vfio
 	makedepends = texlive-latexextra
 	makedepends = git
 	options = !strip
-	source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v6.2.5-arch1
+	source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v6.2.6-arch1
 	source = config
 	source = 0001-add-acs-overrides.patch
 	source = 0002-i915-vga-arbiter.patch
@@ -29,8 +29,8 @@ pkgbase = linux-vfio
 	validpgpkeys = C7E7849466FE2358343588377258734B41C31549
 	sha256sums = SKIP
 	sha256sums = f9a0027bea53a7160759858c535eb0ba0b3bea34c0130f47f2d5bba75d102170
-	sha256sums = 46de3d90603a18762819a21605865e4b4a563744ff3ca73f7b2916c971b1188c
-	sha256sums = 2e383fe0b5e1ba907a4d50e8e04d233f2b5442bba97449e867ae6949ec14c190
+	sha256sums = bdd2a5a56e01e91723907afb40d28bed77b7d5107aba92c85adb3ce6967e713a
+	sha256sums = 9a698eaf1a0bd740981e909b6ad9bd41300488a2a771843bf30b9bdc94aa3c3b
 
 pkgname = linux-vfio
 	pkgdesc = The Linux kernel and modules (ACS override and i915 VGA arbiter patches)
diff --git a/0001-add-acs-overrides.patch b/0001-add-acs-overrides.patch
index 1627195b31ce..2b270d59fade 100644
--- a/0001-add-acs-overrides.patch
+++ b/0001-add-acs-overrides.patch
@@ -1,7 +1,7 @@
-From 370afe321657e7306b3f93de710c837567c4820d Mon Sep 17 00:00:00 2001
+From b41eb63d48790c92ac171fd92ad6355cb724e7ad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=A9clairevoyant?=
  <848000+eclairevoyant@users.noreply.github.com>
-Date: Sun, 8 Jan 2023 14:05:13 -0500
+Date: Tue, 14 Mar 2023 17:06:39 -0400
 Subject: [PATCH 1/2] add-acs-overrides
 
 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 1/2] add-acs-overrides
  2 files changed, 110 insertions(+)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 6b838869554b..8471f29f8c8f 100644
+index 6cfa6e3996cf..fdbe34c0fbf3 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4162,6 +4162,14 @@
+@@ -4178,6 +4178,14 @@
  		nomsi		[MSI] If the PCI_MSI kernel config parameter is
  				enabled, this kernel boot option can be used to
  				disable the use of MSI interrupts system-wide.
@@ -29,7 +29,7 @@ index 6b838869554b..8471f29f8c8f 100644
  				Safety option to keep boot IRQs enabled. This
  				should never be necessary.
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 285acc4aaccc..7ad267e87c34 100644
+index 494fa46f5767..41150eb8bd4c 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
@@ -139,15 +139,15 @@ index 285acc4aaccc..7ad267e87c34 100644
  /*
   * Decoding should be disabled for a PCI device during BAR sizing to avoid
   * conflict. But doing so may cause problems on host bridge and perhaps other
-@@ -4980,6 +5080,8 @@ static const struct pci_dev_acs_enabled {
- 	{ PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs },
- 	/* Zhaoxin Root/Downstream Ports */
+@@ -5002,6 +5102,8 @@ static const struct pci_dev_acs_enabled {
  	{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
+ 	/* Wangxun nics */
+ 	{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
 +	/* allow acs for any */
 +	{ PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
  	{ 0 }
  };
  
 -- 
-2.38.1
+2.39.2
 
diff --git a/0002-i915-vga-arbiter.patch b/0002-i915-vga-arbiter.patch
index 6ff7795f3f38..fc546d8a9791 100644
--- a/0002-i915-vga-arbiter.patch
+++ b/0002-i915-vga-arbiter.patch
@@ -1,7 +1,7 @@
-From efbf3120a8b4bbc66963a696de439501714a1718 Mon Sep 17 00:00:00 2001
+From 61009bd54ec93d15f9c26325cf5e5c68ac98becc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=A9clairevoyant?=
  <848000+eclairevoyant@users.noreply.github.com>
-Date: Sun, 8 Jan 2023 14:05:15 -0500
+Date: Tue, 14 Mar 2023 17:07:40 -0400
 Subject: [PATCH 2/2] i915-vga-arbiter
 
 ---
@@ -14,10 +14,10 @@ Subject: [PATCH 2/2] i915-vga-arbiter
  6 files changed, 52 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
-index de77054195c6..507ee4e0d1dc 100644
+index dedbdb175f8b..e7e95308f6e6 100644
 --- a/drivers/gpu/drm/i915/display/intel_display.c
 +++ b/drivers/gpu/drm/i915/display/intel_display.c
-@@ -8656,9 +8656,11 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
+@@ -8646,9 +8646,11 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
  
  	intel_bios_init(i915);
  
@@ -32,7 +32,7 @@ index de77054195c6..507ee4e0d1dc 100644
  
  	/* FIXME: completely on the wrong abstraction layer */
  	intel_power_domains_init_hw(i915, false);
-@@ -8807,6 +8809,12 @@ int intel_modeset_init(struct drm_i915_private *i915)
+@@ -8796,6 +8798,12 @@ int intel_modeset_init(struct drm_i915_private *i915)
  	if (ret)
  		return ret;
  
@@ -45,7 +45,7 @@ index de77054195c6..507ee4e0d1dc 100644
  	/* Only enable hotplug handling once the fbdev is fully set up. */
  	intel_hpd_init(i915);
  	intel_hpd_poll_disable(i915);
-@@ -8977,6 +8985,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915)
+@@ -8966,6 +8974,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915)
  	if (!HAS_DISPLAY(i915))
  		return;
  
@@ -54,10 +54,10 @@ index de77054195c6..507ee4e0d1dc 100644
  	flush_workqueue(i915->display.wq.modeset);
  
 diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
-index 884e8e67b17c..90f932db61f0 100644
+index 714030136b7f..fbd500249ab1 100644
 --- a/drivers/gpu/drm/i915/display/intel_display.h
 +++ b/drivers/gpu/drm/i915/display/intel_display.h
-@@ -576,6 +576,7 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);
+@@ -535,6 +535,7 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);
  int vlv_get_hpll_vco(struct drm_i915_private *dev_priv);
  int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
  		      const char *name, u32 reg, int ref_freq);
@@ -66,10 +66,10 @@ index 884e8e67b17c..90f932db61f0 100644
  			   const char *name, u32 reg);
  void intel_init_display_hooks(struct drm_i915_private *dev_priv);
 diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
-index b5d058404c14..ad23732a9f21 100644
+index a69bfcac9a94..4cafe1f812f5 100644
 --- a/drivers/gpu/drm/i915/display/intel_vga.c
 +++ b/drivers/gpu/drm/i915/display/intel_vga.c
-@@ -45,6 +45,36 @@ void intel_vga_disable(struct drm_i915_private *dev_priv)
+@@ -46,6 +46,36 @@ void intel_vga_disable(struct drm_i915_private *dev_priv)
  	intel_de_posting_read(dev_priv, vga_reg);
  }
  
@@ -106,7 +106,7 @@ index b5d058404c14..ad23732a9f21 100644
  void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv)
  {
  	i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv);
-@@ -53,6 +83,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv)
+@@ -54,6 +84,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv)
  		drm_dbg_kms(&dev_priv->drm,
  			    "Something enabled VGA plane, disabling it\n");
  		intel_vga_disable(dev_priv);
@@ -154,5 +154,5 @@ index 2733cb6cfe09..f21c5b1529cc 100644
  	param(bool, load_detect_test, false, 0600) \
  	param(bool, force_reset_modeset_test, false, 0600) \
 -- 
-2.38.1
+2.39.2
 
diff --git a/PKGBUILD b/PKGBUILD
index 996cd09c8329..19a4a2d210fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Upstream: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgbase=linux-vfio
-pkgver=6.2.5.arch1
+pkgver=6.2.6.arch1
 pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -30,8 +30,8 @@ validpgpkeys=(
 )
 sha256sums=('SKIP'
             'f9a0027bea53a7160759858c535eb0ba0b3bea34c0130f47f2d5bba75d102170'
-            '46de3d90603a18762819a21605865e4b4a563744ff3ca73f7b2916c971b1188c'
-            '2e383fe0b5e1ba907a4d50e8e04d233f2b5442bba97449e867ae6949ec14c190')
+            'bdd2a5a56e01e91723907afb40d28bed77b7d5107aba92c85adb3ce6967e713a'
+            '9a698eaf1a0bd740981e909b6ad9bd41300488a2a771843bf30b9bdc94aa3c3b')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase