AUR/linux-vfio
1
0
Fork 1
mirror of https://aur.archlinux.org/linux-vfio.git synced 2025-11-03 22:56:52 +00:00
Code Issues Projects Releases Wiki Activity

6.17.1

Browse Source
This commit is contained in:
xiota
2025-10-10 11:55:53 +00:00
parent 3576e17a4a
commit 02f2ae9815
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.SRCINFO
View File

@@ -1,6 +1,6 @@
pkgbase = linux-vfio
pkgdesc = Linux
pkgver = 6.16.10
pkgver = 6.17.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.16.10.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.16.10.tar.sign
source = config-6.16.10::https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/raw/6.16.10.arch1-1/config
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.17.1.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.17.1.tar.sign
source = config-6.17.1::https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/raw/6.17.1.arch1-1/config
source = 1001-6.14.0-add-acs-overrides.patch
source = 1002-6.16.0-i915-vga-arbiter.patch
source = https://github.com/archlinux/linux/releases/download/v6.16.10-arch1/linux-v6.16.10-arch1.patch.zst
source = https://github.com/archlinux/linux/releases/download/v6.16.10-arch1/linux-v6.16.10-arch1.patch.zst.sig
source = 1002-6.17.0-i915-vga-arbiter.patch
source = https://github.com/archlinux/linux/releases/download/v6.17.1-arch1/linux-v6.17.1-arch1.patch.zst
source = https://github.com/archlinux/linux/releases/download/v6.17.1-arch1/linux-v6.17.1-arch1.patch.zst.sig
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
sha256sums = ab06bba8851e4b682e8834f6f90e56d32dcf98d8c62cd537676104cfd757a8f2
sha256sums = a53dbe3f41491922a61f17c5cc551e88f544d5411aeb1c8c65c402795c4f4da0
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396
sha256sums = e9bcc4ef67e96e9b6f3f4bed5f1c8467db7ecdfbd365e398c5bde2fa9b2b9c8b
sha256sums = 7aa1b5da09f5d4485bbe07f28725c9750dca544f7c7d66ffb0c822236cc14897
sha256sums = SKIP
sha256sums = SKIP

48
1002-6.16.0-i915-vga-arbiter.patch → 1002-6.17.0-i915-vga-arbiter.patch
View File

@@ -1,6 +1,6 @@
From 905f94b3533a3e008ca534e2f0d0a01162beb96c Mon Sep 17 00:00:00 2001
From c3ef7b73136fa897006d5b11de8a68962000bc22 Mon Sep 17 00:00:00 2001
From: xiota <>
Date: Mon, 18 Aug 2025 15:44:08 +0000
Date: Fri, 10 Oct 2025 11:24:47 +0000
Subject: [PATCH] i915-vga-arbiter
---
@@ -8,16 +8,16 @@ Subject: [PATCH] i915-vga-arbiter
.../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.c | 34 +++++++++++++++++++
drivers/gpu/drm/i915/display/intel_vga.h | 4 +++
.../gpu/drm/xe/compat-i915-headers/i915_drv.h | 6 ++++
7 files changed, 63 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 411fe7b9..25f98fb9 100644
index 8586ba102..5c8ce811a 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 @@
@@ -31,6 +31,7 @@
#include "intel_display_debugfs.h"
#include "intel_display_driver.h"
#include "intel_display_irq.h"
@@ -25,7 +25,7 @@ index 411fe7b9..25f98fb9 100644
#include "intel_display_power.h"
#include "intel_display_types.h"
#include "intel_display_wa.h"
@@ -223,9 +224,11 @@ int intel_display_driver_probe_noirq(struct intel_display *display)
@@ -219,9 +220,11 @@ int intel_display_driver_probe_noirq(struct intel_display *display)
intel_bios_init(display);
@@ -40,7 +40,7 @@ index 411fe7b9..25f98fb9 100644
intel_psr_dc5_dc6_wa_init(display);
@@ -538,6 +541,12 @@ int intel_display_driver_probe(struct intel_display *display)
@@ -552,6 +555,12 @@ int intel_display_driver_probe(struct intel_display *display)
intel_overlay_setup(display);
@@ -53,7 +53,7 @@ index 411fe7b9..25f98fb9 100644
/* Only enable hotplug handling once the fbdev is fully set up. */
intel_hpd_init(display);
@@ -588,6 +597,8 @@ void intel_display_driver_remove(struct intel_display *display)
@@ -602,6 +611,8 @@ void intel_display_driver_remove(struct intel_display *display)
if (!HAS_DISPLAY(display))
return;
@@ -62,16 +62,16 @@ index 411fe7b9..25f98fb9 100644
flush_workqueue(display->wq.flip);
flush_workqueue(display->wq.modeset);
flush_workqueue(display->wq.cleanup);
@@ -619,6 +630,7 @@ void intel_display_driver_remove_noirq(struct intel_display *display)
@@ -632,6 +643,7 @@ void intel_display_driver_remove_noirq(struct intel_display *display)
intel_unregister_dsm_handler();
/* flush any delayed tasks or pending work */
+ intel_vga_enable_mem(display);
flush_workqueue(i915->unordered_wq);
flush_workqueue(display->wq.unordered);
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 2966ff91..ca0dc757 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_modeset_acquire_ctx;
@@ -83,10 +83,10 @@ index 2966ff91..ca0dc757 100644
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 c4f1ab43..9146bddf 100644
index 75316247e..844176964 100644
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -99,6 +99,9 @@ intel_display_param_named_unsafe(force_reset_modeset_test, bool, 0400,
@@ -102,6 +102,9 @@ intel_display_param_named_unsafe(force_reset_modeset_test, bool, 0400,
intel_display_param_named(disable_display, bool, 0400,
"Disable display (default: false)");
@@ -97,34 +97,33 @@ index c4f1ab43..9146bddf 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 5317138e..5451b18b 100644
index 784e6bae8..23e697cbe 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;
@@ -41,6 +41,7 @@ struct drm_printer;
param(bool, load_detect_test, false, 0600) \
param(bool, force_reset_modeset_test, false, 0600) \
param(bool, disable_display, false, 0400) \
+ param(bool, enable_hd_vgaarb, false, 0600) \
+ param(bool, enable_hd_vgaarb, false, 0400) \
param(bool, verbose_state_checks, true, 0400) \
param(bool, nuclear_pageflip, false, 0400) \
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
index 05d140c8..4bb5bc98 100644
index 6e125564d..3921e27be 100644
--- a/drivers/gpu/drm/i915/display/intel_vga.c
+++ b/drivers/gpu/drm/i915/display/intel_vga.c
@@ -13,9 +13,11 @@
@@ -13,8 +13,10 @@
#include "soc/intel_gmch.h"
+#include "i915_drv.h"
#include "i915_reg.h"
#include "intel_de.h"
#include "intel_display.h"
+#include "intel_display_params.h"
#include "intel_vga.h"
#include "intel_vga_regs.h"
@@ -77,6 +79,37 @@ void intel_vga_disable(struct intel_display *display)
@@ -76,6 +78,38 @@ void intel_vga_disable(struct intel_display *display)
intel_de_posting_read(display, vga_reg);
}
@@ -158,12 +157,13 @@ index 05d140c8..4bb5bc98 100644
+ vga_put(pdev, VGA_RSRC_LEGACY_IO);
+ }
+}
+
+
void intel_vga_reset_io_mem(struct intel_display *display)
{
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
index 16d699f3..d91a6cf6 100644
index 16d699f3b..d91a6cf67 100644
--- a/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);
@@ -176,7 +176,7 @@ index 16d699f3..d91a6cf6 100644
+
#endif /* __INTEL_VGA_H__ */
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
index 9b7572e0..043734cf 100644
index 9b7572e06..043734cf0 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
@@ -21,6 +21,12 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev)
@@ -193,5 +193,5 @@ index 9b7572e0..043734cf 100644
#define IS_PLATFORM(xe, x) ((xe)->info.platform == x)
#define IS_I915G(dev_priv) (dev_priv && 0)
--
2.50.1
2.51.0

8
PKGBUILD
View File

@@ -14,7 +14,7 @@
: ${_build_level:=1}
: ${_cksum=ab06bba8851e4b682e8834f6f90e56d32dcf98d8c62cd537676104cfd757a8f2}
: ${_cksum=a53dbe3f41491922a61f17c5cc551e88f544d5411aeb1c8c65c402795c4f4da0}
unset _pkgtype
[[ ${_build_vfio::1} == "t" ]] && _pkgtype+="-vfio"
@@ -26,7 +26,7 @@ unset _pkgtype
_gitname="linux"
_pkgname="$_gitname${_pkgtype:-}"
pkgbase="$_pkgname"
pkgver=6.16.10
pkgver=6.17.1
pkgrel=1
pkgdesc='Linux'
url='https://www.kernel.org'
@@ -82,11 +82,11 @@ validpgpkeys=(
if [[ "${_build_vfio::1}" == "t" ]]; then
source+=(
1001-6.14.0-add-acs-overrides.patch # updated from https://lkml.org/lkml/2013/5/30/513
1002-6.16.0-i915-vga-arbiter.patch # updated from https://lkml.org/lkml/2014/5/9/517
1002-6.17.0-i915-vga-arbiter.patch # updated from https://lkml.org/lkml/2014/5/9/517
)
sha256sums+=(
'6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396'
'e9bcc4ef67e96e9b6f3f4bed5f1c8467db7ecdfbd365e398c5bde2fa9b2b9c8b'
'7aa1b5da09f5d4485bbe07f28725c9750dca544f7c7d66ffb0c822236cc14897'
)
fi