AUR/linux-vfio
1
0
Fork 1
mirror of https://aur.archlinux.org/linux-vfio.git synced 2026-05-07 08:11:14 +00:00
Code Issues Projects Releases Wiki Activity

7.0.2

Browse Source
This commit is contained in:
xiota
2026-04-30 01:39:26 +00:00
parent 25d1c48128
commit 04ed5e6fb7
3 changed files with 76 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.SRCINFO
View File

@@ -1,6 +1,6 @@
pkgbase = linux-vfio pkgbase = linux-vfio
pkgdesc = Linux pkgdesc = Linux
pkgver = 6.19.14 pkgver = 7.0.2
pkgrel = 1 pkgrel = 1
url = https://www.kernel.org url = https://www.kernel.org
arch = x86_64 arch = x86_64
@@ -24,21 +24,21 @@ pkgbase = linux-vfio
makedepends = texlive-latexextra makedepends = texlive-latexextra
options = !debug options = !debug
options = !strip options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.19.14.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-7.0.2.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.19.14.tar.sign source = https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-7.0.2.tar.sign
source = config-6.19.14::https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/raw/6.19.14.arch1-1/config.x86_64 source = config-7.0.2::https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/raw/7.0.2.arch1-1/config.x86_64
source = 1001-6.14.0-add-acs-overrides.patch source = 1001-6.14.0-add-acs-overrides.patch
source = 1002-6.18.0-i915-vga-arbiter.patch source = 1002-7.0.0-i915-vga-arbiter.patch
source = https://github.com/archlinux/linux/releases/download/v6.19.14-arch1/linux-v6.19.14-arch1.patch.zst source = https://github.com/archlinux/linux/releases/download/v7.0.2-arch1/linux-v7.0.2-arch1.patch.zst
source = https://github.com/archlinux/linux/releases/download/v6.19.14-arch1/linux-v6.19.14-arch1.patch.zst.sig source = https://github.com/archlinux/linux/releases/download/v7.0.2-arch1/linux-v7.0.2-arch1.patch.zst.sig
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
sha256sums = cde8bf6739be4a0777fedbbba5330b8188c55680c45a922a4dfa289cbec6f185 sha256sums = 53591a03294527a48ccb0b9e559e922df8a38554745a1206827ca751d2ca7662
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = 6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396 sha256sums = 6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396
sha256sums = 323fc06392a6c10d7eb3d844cde527fa7709c82f776238cebc98d8c966b06549 sha256sums = 6f5b96e18acbfb5d69accb99818249dd9a97cb565c80628e6018468bca6e6c37
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP

91
1002-6.18.0-i915-vga-arbiter.patch → 1002-7.0.0-i915-vga-arbiter.patch
View File

@@ -1,30 +1,33 @@
From 8d0bbb8f0f4e901d112be6c50715a6f1a6091e0e Mon Sep 17 00:00:00 2001 From ed1d33f16fdee0ab9b4e21cd8b93fcf6008cb0c6 Mon Sep 17 00:00:00 2001
From: xiota <> From: xiota <>
Date: Thu, 25 Dec 2025 02:36:25 +0000 Date: Thu, 30 Apr 2026 00:46:34 +0000
Subject: [PATCH] i915-vga-arbiter Subject: [PATCH] i915-vga-arbiter
--- ---
.../drm/i915/display/intel_display_driver.c | 18 +++++++++-- .../drm/i915/display/intel_display_driver.c | 24 ++++++++++--
.../drm/i915/display/intel_display_driver.h | 1 + .../drm/i915/display/intel_display_driver.h | 4 ++
.../drm/i915/display/intel_display_params.c | 3 ++ .../drm/i915/display/intel_display_params.c | 3 ++
.../drm/i915/display/intel_display_params.h | 1 + .../drm/i915/display/intel_display_params.h | 1 +
drivers/gpu/drm/i915/display/intel_vga.c | 31 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_vga.c | 39 +++++++++++++++++++
drivers/gpu/drm/i915/display/intel_vga.h | 4 +++ drivers/gpu/drm/i915/display/intel_vga.h | 6 +++
6 files changed, 55 insertions(+), 3 deletions(-) drivers/gpu/drm/xe/Makefile | 1 +
i | 0
8 files changed, 75 insertions(+), 3 deletions(-)
create mode 100644 i
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index cf1c14412..653cb0640 100644 index 268b1de45..98e1de0ff 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -32,6 +32,7 @@ @@ -33,6 +33,7 @@
#include "intel_display_debugfs.h" #include "intel_display_debugfs.h"
#include "intel_display_driver.h" #include "intel_display_driver.h"
#include "intel_display_irq.h" #include "intel_display_irq.h"
+#include "intel_display_params.h" +#include "intel_display_params.h"
#include "intel_display_power.h" #include "intel_display_power.h"
#include "intel_display_types.h" #include "intel_display_types.h"
#include "intel_display_wa.h" #include "intel_display_utils.h"
@@ -220,9 +221,11 @@ int intel_display_driver_probe_noirq(struct intel_display *display) @@ -208,9 +209,11 @@ int intel_display_driver_probe_noirq(struct intel_display *display)
intel_bios_init(display); intel_bios_init(display);
@@ -39,45 +42,54 @@ index cf1c14412..653cb0640 100644
intel_psr_dc5_dc6_wa_init(display); intel_psr_dc5_dc6_wa_init(display);
@@ -553,6 +556,12 @@ int intel_display_driver_probe(struct intel_display *display) @@ -538,6 +541,14 @@ int intel_display_driver_probe(struct intel_display *display)
intel_overlay_setup(display); intel_overlay_setup(display);
+#ifndef VGA_ARBITER_BUILD_XE
+ /* + /*
+ * Must do this after fbcon init so that + * Must do this after fbcon init so that
+ * vgacon_save_screen() works during the handover. + * vgacon_save_screen() works during the handover.
+ */ + */
+ intel_vga_disable_mem(display); + intel_vga_disable_mem(display);
+#endif /* VGA_ARBITER_BUILD_XE */
+ +
/* Only enable hotplug handling once the fbdev is fully set up. */ /* Only enable hotplug handling once the fbdev is fully set up. */
intel_hpd_init(display); intel_hpd_init(display);
@@ -603,6 +612,8 @@ void intel_display_driver_remove(struct intel_display *display) @@ -588,6 +599,10 @@ void intel_display_driver_remove(struct intel_display *display)
if (!HAS_DISPLAY(display)) if (!HAS_DISPLAY(display))
return; return;
+#ifndef VGA_ARBITER_BUILD_XE
+ intel_vga_enable_mem(display); + intel_vga_enable_mem(display);
+#endif /* VGA_ARBITER_BUILD_XE */
+ +
flush_workqueue(display->wq.flip); flush_workqueue(display->wq.flip);
flush_workqueue(display->wq.modeset); flush_workqueue(display->wq.modeset);
flush_workqueue(display->wq.cleanup); flush_workqueue(display->wq.cleanup);
@@ -633,6 +644,7 @@ void intel_display_driver_remove_noirq(struct intel_display *display) @@ -618,6 +633,9 @@ void intel_display_driver_remove_noirq(struct intel_display *display)
intel_unregister_dsm_handler(); intel_unregister_dsm_handler();
/* flush any delayed tasks or pending work */ /* flush any delayed tasks or pending work */
+#ifndef VGA_ARBITER_BUILD_XE
+ intel_vga_enable_mem(display); + intel_vga_enable_mem(display);
+#endif /* VGA_ARBITER_BUILD_XE */
flush_workqueue(display->wq.unordered); flush_workqueue(display->wq.unordered);
intel_hdcp_component_fini(display); 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 diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
index 2966ff91b..ca0dc7577 100644 index 2966ff91b..939124c3b 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.h --- a/drivers/gpu/drm/i915/display/intel_display_driver.h
+++ b/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_modeset_acquire_ctx; @@ -13,6 +13,10 @@ struct drm_modeset_acquire_ctx;
struct intel_display; struct intel_display;
struct pci_dev; struct pci_dev;
+#ifndef VGA_ARBITER_BUILD_XE
+extern void intel_vga_disable_mem(struct intel_display *display); +extern void intel_vga_disable_mem(struct intel_display *display);
+#endif /* VGA_ARBITER_BUILD_XE */
+
bool intel_display_driver_probe_defer(struct pci_dev *pdev); bool intel_display_driver_probe_defer(struct pci_dev *pdev);
void intel_display_driver_init_hw(struct intel_display *display); void intel_display_driver_init_hw(struct intel_display *display);
void intel_display_driver_early_probe(struct intel_display *display); void intel_display_driver_early_probe(struct intel_display *display);
@@ -96,7 +108,7 @@ index 2aed110c5..db4fbf207 100644
"Enable verbose logs (ie. WARN_ON()) in case of unexpected hw state conditions."); "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 diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
index b01bc5700..27dd77805 100644 index b95ecf728..6e01bf1b0 100644
--- a/drivers/gpu/drm/i915/display/intel_display_params.h --- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -41,6 +41,7 @@ struct drm_printer; @@ -41,6 +41,7 @@ struct drm_printer;
@@ -108,24 +120,31 @@ index b01bc5700..27dd77805 100644
param(bool, nuclear_pageflip, false, 0400) \ param(bool, nuclear_pageflip, false, 0400) \
param(bool, enable_dp_mst, true, 0600) \ param(bool, enable_dp_mst, true, 0600) \
diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
index 6e125564d..dd7e45f89 100644 index c45c4bbc3..1fef50f2e 100644
--- a/drivers/gpu/drm/i915/display/intel_vga.c --- a/drivers/gpu/drm/i915/display/intel_vga.c
+++ b/drivers/gpu/drm/i915/display/intel_vga.c +++ b/drivers/gpu/drm/i915/display/intel_vga.c
@@ -13,8 +13,10 @@ @@ -12,8 +12,16 @@
#include <drm/intel/i915_drm.h>
#include "soc/intel_gmch.h" #include <video/vga.h>
+#ifndef VGA_ARBITER_BUILD_XE
+#warning "Building i915 version — i915 header included"
+#include "i915_drv.h" +#include "i915_drv.h"
+#else /* VGA_ARBITER_BUILD_XE */
+#warning "Building XE version — i915 header excluded"
+#endif /* VGA_ARBITER_BUILD_XE */
+
#include "intel_de.h" #include "intel_de.h"
#include "intel_display.h" #include "intel_display.h"
+#include "intel_display_params.h" +#include "intel_display_params.h"
#include "intel_display_types.h"
#include "intel_vga.h" #include "intel_vga.h"
#include "intel_vga_regs.h" #include "intel_vga_regs.h"
@@ -76,6 +84,37 @@ void intel_vga_disable(struct intel_display *display)
@@ -76,6 +78,35 @@ void intel_vga_disable(struct intel_display *display)
intel_de_posting_read(display, vga_reg); intel_de_posting_read(display, vga_reg);
} }
+#ifndef VGA_ARBITER_BUILD_XE
+void intel_vga_enable_mem(struct intel_display *display) +void intel_vga_enable_mem(struct intel_display *display)
+{ +{
+ struct pci_dev *pdev = to_pci_dev(display->drm->dev); + struct pci_dev *pdev = to_pci_dev(display->drm->dev);
@@ -154,23 +173,41 @@ index 6e125564d..dd7e45f89 100644
+ vga_put(pdev, VGA_RSRC_LEGACY_IO); + vga_put(pdev, VGA_RSRC_LEGACY_IO);
+ } + }
+} +}
+#endif /* VGA_ARBITER_BUILD_XE */
+ +
void intel_vga_reset_io_mem(struct intel_display *display) void intel_vga_reset_io_mem(struct intel_display *display)
{ {
struct pci_dev *pdev = to_pci_dev(display->drm->dev); struct pci_dev *pdev = to_pci_dev(display->drm->dev);
diff --git a/drivers/gpu/drm/i915/display/intel_vga.h b/drivers/gpu/drm/i915/display/intel_vga.h diff --git a/drivers/gpu/drm/i915/display/intel_vga.h b/drivers/gpu/drm/i915/display/intel_vga.h
index 16d699f3b..d91a6cf67 100644 index 16d699f3b..a20721eb6 100644
--- a/drivers/gpu/drm/i915/display/intel_vga.h --- a/drivers/gpu/drm/i915/display/intel_vga.h
+++ b/drivers/gpu/drm/i915/display/intel_vga.h +++ b/drivers/gpu/drm/i915/display/intel_vga.h
@@ -13,4 +13,8 @@ void intel_vga_disable(struct intel_display *display); @@ -13,4 +13,10 @@ void intel_vga_disable(struct intel_display *display);
int intel_vga_register(struct intel_display *display); int intel_vga_register(struct intel_display *display);
void intel_vga_unregister(struct intel_display *display); void intel_vga_unregister(struct intel_display *display);
+#ifndef VGA_ARBITER_BUILD_XE
+/* i915 vga arb patch */ +/* i915 vga arb patch */
+void intel_vga_enable_mem(struct intel_display *display); +void intel_vga_enable_mem(struct intel_display *display);
+void intel_vga_disable_mem(struct intel_display *display); +void intel_vga_disable_mem(struct intel_display *display);
+#endif /* VGA_ARBITER_BUILD_XE */
+ +
#endif /* __INTEL_VGA_H__ */ #endif /* __INTEL_VGA_H__ */
-- diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
2.52.0 index b39cbb756..4506996e1 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -199,6 +199,7 @@ endif
# i915 Display compat #defines and #includes
subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \
+ -DVGA_ARBITER_BUILD_XE=1 \
-I$(src)/compat-i915-headers \
-I$(srctree)/drivers/gpu/drm/i915/display/
diff --git a/i b/i
new file mode 100644
index 000000000..e69de29bb
--
2.54.0

8
PKGBUILD
View File

@@ -12,7 +12,7 @@
: ${_build_level:=1} : ${_build_level:=1}
: ${_cksum=cde8bf6739be4a0777fedbbba5330b8188c55680c45a922a4dfa289cbec6f185} : ${_cksum=53591a03294527a48ccb0b9e559e922df8a38554745a1206827ca751d2ca7662}
unset _pkgtype unset _pkgtype
[[ ${_build_vfio::1} == "t" ]] && _pkgtype+="-vfio" [[ ${_build_vfio::1} == "t" ]] && _pkgtype+="-vfio"
@@ -24,7 +24,7 @@ unset _pkgtype
_gitname="linux" _gitname="linux"
_pkgname="$_gitname${_pkgtype:-}" _pkgname="$_gitname${_pkgtype:-}"
pkgbase="$_pkgname" pkgbase="$_pkgname"
pkgver=6.19.14 pkgver=7.0.2
pkgrel=1 pkgrel=1
pkgdesc='Linux' pkgdesc='Linux'
url='https://www.kernel.org' url='https://www.kernel.org'
@@ -82,11 +82,11 @@ validpgpkeys=(
if [[ "${_build_vfio::1}" == "t" ]]; then if [[ "${_build_vfio::1}" == "t" ]]; then
source+=( source+=(
1001-6.14.0-add-acs-overrides.patch # updated from https://lkml.org/lkml/2013/5/30/513 1001-6.14.0-add-acs-overrides.patch # updated from https://lkml.org/lkml/2013/5/30/513
1002-6.18.0-i915-vga-arbiter.patch # updated from https://lkml.org/lkml/2014/5/9/517 1002-7.0.0-i915-vga-arbiter.patch # updated from https://lkml.org/lkml/2014/5/9/517
) )
sha256sums+=( sha256sums+=(
'6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396' '6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396'
'323fc06392a6c10d7eb3d844cde527fa7709c82f776238cebc98d8c966b06549' '6f5b96e18acbfb5d69accb99818249dd9a97cb565c80628e6018468bca6e6c37'
) )
fi fi