mirror of
https://aur.archlinux.org/linux-vfio.git
synced 2025-07-01 10:19:13 +00:00
6.14.1
This commit is contained in:
22
.SRCINFO
22
.SRCINFO
@ -1,6 +1,6 @@
|
||||
pkgbase = linux-vfio
|
||||
pkgdesc = Linux
|
||||
pkgver = 6.13.9
|
||||
pkgver = 6.14.1
|
||||
pkgrel = 1
|
||||
url = https://www.kernel.org
|
||||
arch = x86_64
|
||||
@ -25,21 +25,21 @@ pkgbase = linux-vfio
|
||||
makedepends = texlive-latexextra
|
||||
options = !debug
|
||||
options = !strip
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.13.9.tar.xz
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.13.9.tar.sign
|
||||
source = config-6.13.9::https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/raw/main/config
|
||||
source = 1001-6.13.0-add-acs-overrides.patch
|
||||
source = 1002-6.13.0-i915-vga-arbiter.patch
|
||||
source = https://github.com/archlinux/linux/releases/download/v6.13.8-arch1/linux-v6.13.8-arch1.patch.zst
|
||||
source = https://github.com/archlinux/linux/releases/download/v6.13.8-arch1/linux-v6.13.8-arch1.patch.zst.sig
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.14.1.tar.xz
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.14.1.tar.sign
|
||||
source = config-6.14.1::https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/raw/6.14.1.arch1-1/config
|
||||
source = 1001-6.14.0-add-acs-overrides.patch
|
||||
source = 1002-6.14.0-i915-vga-arbiter.patch
|
||||
source = https://github.com/archlinux/linux/releases/download/v6.14.1-arch1/linux-v6.14.1-arch1.patch.zst
|
||||
source = https://github.com/archlinux/linux/releases/download/v6.14.1-arch1/linux-v6.14.1-arch1.patch.zst.sig
|
||||
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
||||
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
|
||||
validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
|
||||
sha256sums = 53e7a3f028b6119ba499245bde0fa10275752817408a4a36b5a34ad74a4727b2
|
||||
sha256sums = 5bf122d1879fd64fadf0cecfcd477957ebce1bc5931c14835ee0eda88463e407
|
||||
sha256sums = SKIP
|
||||
sha256sums = SKIP
|
||||
sha256sums = 569742a1c7ce7996ee4c650c444ed13d650fff7b84f23a16e6358693e58aee9f
|
||||
sha256sums = 40bb65492702d3f92dd67f8f1e424a1c686f1ff2e2d7d2566451693a7adc09f3
|
||||
sha256sums = 6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396
|
||||
sha256sums = 827b169cf33da439d1d01e5c24ddee229879d57db4b9e1ea219c49289a249384
|
||||
sha256sums = SKIP
|
||||
sha256sums = SKIP
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From bca709f513eff78dbd976ff8dc7e64df5107ac37 Mon Sep 17 00:00:00 2001
|
||||
From 10155f0a9e245f4fb6dd68785a59c83722d436d7 Mon Sep 17 00:00:00 2001
|
||||
From: xiota <>
|
||||
Date: Wed, 13 Mar 2024 02:36:37 +0000
|
||||
Subject: [PATCH] add-acs-overrides
|
||||
@ -9,10 +9,10 @@ Subject: [PATCH] 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 3872bc6..b8cb3e3 100644
|
||||
index fb8752b42..f652c063a 100644
|
||||
--- a/Documentation/admin-guide/kernel-parameters.txt
|
||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
||||
@@ -4481,6 +4481,14 @@
|
||||
@@ -4642,6 +4642,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.
|
||||
@ -28,10 +28,10 @@ index 3872bc6..b8cb3e3 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 76f4df7..49150a2 100644
|
||||
index 82b21e34c..b9cc12277 100644
|
||||
--- a/drivers/pci/quirks.c
|
||||
+++ b/drivers/pci/quirks.c
|
||||
@@ -5017,6 +5017,106 @@ static int pci_quirk_wangxun_nic_acs(struct pci_dev *dev, u16 acs_flags)
|
||||
@@ -5018,6 +5018,106 @@ static int pci_quirk_wangxun_nic_acs(struct pci_dev *dev, u16 acs_flags)
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -138,7 +138,7 @@ index 76f4df7..49150a2 100644
|
||||
static const struct pci_dev_acs_enabled {
|
||||
u16 vendor;
|
||||
u16 device;
|
||||
@@ -5170,6 +5270,8 @@ static const struct pci_dev_acs_enabled {
|
||||
@@ -5171,6 +5271,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 },
|
||||
@ -148,5 +148,5 @@ index 76f4df7..49150a2 100644
|
||||
};
|
||||
|
||||
--
|
||||
2.48.1
|
||||
2.49.0
|
||||
|
@ -1,20 +1,20 @@
|
||||
From 32d421bf11726bac8f1bbf105095db02023117d5 Mon Sep 17 00:00:00 2001
|
||||
From 330fad536d9da07f6fb8f58901d939ea3292238f Mon Sep 17 00:00:00 2001
|
||||
From: xiota <>
|
||||
Date: Mon, 27 Jan 2025 05:45:27 +0000
|
||||
Date: Tue, 1 Apr 2025 14:48:21 +0000
|
||||
Subject: [PATCH] i915-vga-arbiter
|
||||
|
||||
---
|
||||
.../drm/i915/display/intel_display_driver.c | 20 +++++++++--
|
||||
.../drm/i915/display/intel_display_driver.c | 18 ++++++++--
|
||||
.../drm/i915/display/intel_display_driver.h | 1 +
|
||||
.../drm/i915/display/intel_display_params.c | 3 ++
|
||||
.../drm/i915/display/intel_display_params.h | 1 +
|
||||
drivers/gpu/drm/i915/display/intel_vga.c | 33 +++++++++++++++++++
|
||||
drivers/gpu/drm/i915/display/intel_vga.h | 4 +++
|
||||
.../gpu/drm/xe/compat-i915-headers/i915_drv.h | 7 ++++
|
||||
7 files changed, 66 insertions(+), 3 deletions(-)
|
||||
7 files changed, 64 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
|
||||
index 56b78cf6b..b787f82dc 100644
|
||||
index 50ec0c3c7..a1b005db2 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
|
||||
@@ -30,6 +30,7 @@
|
||||
@ -25,7 +25,7 @@ index 56b78cf6b..b787f82dc 100644
|
||||
#include "intel_display_power.h"
|
||||
#include "intel_display_types.h"
|
||||
#include "intel_display_wa.h"
|
||||
@@ -221,9 +222,11 @@ int intel_display_driver_probe_noirq(struct drm_i915_private *i915)
|
||||
@@ -222,9 +223,11 @@ int intel_display_driver_probe_noirq(struct intel_display *display)
|
||||
|
||||
intel_bios_init(display);
|
||||
|
||||
@ -39,10 +39,10 @@ index 56b78cf6b..b787f82dc 100644
|
||||
+ }
|
||||
|
||||
/* FIXME: completely on the wrong abstraction layer */
|
||||
ret = intel_power_domains_init(i915);
|
||||
@@ -520,6 +523,12 @@ int intel_display_driver_probe(struct drm_i915_private *i915)
|
||||
ret = intel_power_domains_init(display);
|
||||
@@ -523,6 +526,12 @@ int intel_display_driver_probe(struct intel_display *display)
|
||||
|
||||
intel_overlay_setup(i915);
|
||||
intel_overlay_setup(display);
|
||||
|
||||
+ /*
|
||||
+ * Must do this after fbcon init so that
|
||||
@ -53,21 +53,16 @@ index 56b78cf6b..b787f82dc 100644
|
||||
/* Only enable hotplug handling once the fbdev is fully set up. */
|
||||
intel_hpd_init(i915);
|
||||
|
||||
@@ -566,9 +575,13 @@ void intel_display_driver_register(struct drm_i915_private *i915)
|
||||
/* part #1: call before irq uninstall */
|
||||
void intel_display_driver_remove(struct drm_i915_private *i915)
|
||||
{
|
||||
+ struct intel_display *display = &i915->display;
|
||||
+
|
||||
if (!HAS_DISPLAY(i915))
|
||||
@@ -572,6 +581,8 @@ void intel_display_driver_remove(struct intel_display *display)
|
||||
if (!HAS_DISPLAY(display))
|
||||
return;
|
||||
|
||||
+ intel_vga_enable_mem(display);
|
||||
+
|
||||
flush_workqueue(i915->display.wq.flip);
|
||||
flush_workqueue(i915->display.wq.modeset);
|
||||
|
||||
@@ -599,6 +612,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)
|
||||
flush_workqueue(display->wq.flip);
|
||||
flush_workqueue(display->wq.modeset);
|
||||
flush_workqueue(display->wq.cleanup);
|
||||
@@ -603,6 +614,7 @@ void intel_display_driver_remove_noirq(struct intel_display *display)
|
||||
intel_unregister_dsm_handler();
|
||||
|
||||
/* flush any delayed tasks or pending work */
|
||||
@ -76,22 +71,22 @@ index 56b78cf6b..b787f82dc 100644
|
||||
|
||||
intel_hdcp_component_fini(display);
|
||||
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
|
||||
index 42cc4af6d..3b233969b 100644
|
||||
index 2966ff91b..ca0dc7577 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_display_driver.h
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
|
||||
@@ -13,6 +13,7 @@ struct drm_i915_private;
|
||||
struct drm_modeset_acquire_ctx;
|
||||
@@ -13,6 +13,7 @@ struct drm_modeset_acquire_ctx;
|
||||
struct intel_display;
|
||||
struct pci_dev;
|
||||
|
||||
+extern void intel_vga_disable_mem(struct intel_display *display);
|
||||
bool intel_display_driver_probe_defer(struct pci_dev *pdev);
|
||||
void intel_display_driver_init_hw(struct drm_i915_private *i915);
|
||||
void intel_display_driver_early_probe(struct drm_i915_private *i915);
|
||||
void intel_display_driver_init_hw(struct intel_display *display);
|
||||
void intel_display_driver_early_probe(struct intel_display *display);
|
||||
diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
|
||||
index 024de8abc..efc57e90c 100644
|
||||
index f92e4640a..e463b0b13 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
|
||||
@@ -94,6 +94,9 @@ intel_display_param_named_unsafe(force_reset_modeset_test, bool, 0400,
|
||||
@@ -99,6 +99,9 @@ intel_display_param_named_unsafe(force_reset_modeset_test, bool, 0400,
|
||||
intel_display_param_named(disable_display, bool, 0400,
|
||||
"Disable display (default: false)");
|
||||
|
||||
@ -102,7 +97,7 @@ index 024de8abc..efc57e90c 100644
|
||||
"Enable verbose logs (ie. WARN_ON()) in case of unexpected hw state conditions.");
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
|
||||
index dcb6face9..1900b9ff9 100644
|
||||
index 5317138e6..5451b18b6 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
|
||||
@@ -40,6 +40,7 @@ struct drm_printer;
|
||||
@ -203,5 +198,5 @@ index 84b0991b3..a908e706e 100644
|
||||
#define INTEL_INFO(dev_priv) (&((dev_priv)->info))
|
||||
#define IS_I830(dev_priv) (dev_priv && 0)
|
||||
--
|
||||
2.48.1
|
||||
2.49.0
|
||||
|
12
PKGBUILD
12
PKGBUILD
@ -14,7 +14,7 @@
|
||||
|
||||
: ${_build_level:=1}
|
||||
|
||||
: ${_cksum:=53e7a3f028b6119ba499245bde0fa10275752817408a4a36b5a34ad74a4727b2}
|
||||
: ${_cksum:=5bf122d1879fd64fadf0cecfcd477957ebce1bc5931c14835ee0eda88463e407}
|
||||
|
||||
unset _pkgtype
|
||||
[[ ${_build_vfio::1} == "t" ]] && _pkgtype+="-vfio"
|
||||
@ -26,7 +26,7 @@ unset _pkgtype
|
||||
_gitname="linux"
|
||||
_pkgname="$_gitname${_pkgtype:-}"
|
||||
pkgbase="$_pkgname"
|
||||
pkgver=6.13.9
|
||||
pkgver=6.14.1
|
||||
pkgrel=1
|
||||
pkgdesc='Linux'
|
||||
url='https://www.kernel.org'
|
||||
@ -81,12 +81,12 @@ validpgpkeys=(
|
||||
|
||||
if [[ ${_build_vfio::1} == "t" ]]; then
|
||||
source+=(
|
||||
1001-6.13.0-add-acs-overrides.patch # updated from https://lkml.org/lkml/2013/5/30/513
|
||||
1002-6.13.0-i915-vga-arbiter.patch # updated from https://lkml.org/lkml/2014/5/9/517
|
||||
1001-6.14.0-add-acs-overrides.patch # updated from https://lkml.org/lkml/2013/5/30/513
|
||||
1002-6.14.0-i915-vga-arbiter.patch # updated from https://lkml.org/lkml/2014/5/9/517
|
||||
)
|
||||
sha256sums+=(
|
||||
'569742a1c7ce7996ee4c650c444ed13d650fff7b84f23a16e6358693e58aee9f'
|
||||
'40bb65492702d3f92dd67f8f1e424a1c686f1ff2e2d7d2566451693a7adc09f3'
|
||||
'6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396'
|
||||
'827b169cf33da439d1d01e5c24ddee229879d57db4b9e1ea219c49289a249384'
|
||||
)
|
||||
fi
|
||||
|
||||
|
Reference in New Issue
Block a user