diff --git a/.SRCINFO b/.SRCINFO index aa8578d..37ea8f0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-vfio pkgdesc = Linux - pkgver = 6.19.14 + pkgver = 7.0.2 pkgrel = 1 url = https://www.kernel.org arch = x86_64 @@ -24,21 +24,21 @@ pkgbase = linux-vfio makedepends = texlive-latexextra options = !debug 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/v6.x/linux-6.19.14.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 = https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-7.0.2.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-7.0.2.tar.sign + 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 = 1002-6.18.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/v6.19.14-arch1/linux-v6.19.14-arch1.patch.zst.sig + source = 1002-7.0.0-i915-vga-arbiter.patch + 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/v7.0.2-arch1/linux-v7.0.2-arch1.patch.zst.sig validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF - sha256sums = cde8bf6739be4a0777fedbbba5330b8188c55680c45a922a4dfa289cbec6f185 + sha256sums = 53591a03294527a48ccb0b9e559e922df8a38554745a1206827ca751d2ca7662 sha256sums = SKIP sha256sums = SKIP sha256sums = 6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396 - sha256sums = 323fc06392a6c10d7eb3d844cde527fa7709c82f776238cebc98d8c966b06549 + sha256sums = 6f5b96e18acbfb5d69accb99818249dd9a97cb565c80628e6018468bca6e6c37 sha256sums = SKIP sha256sums = SKIP diff --git a/1002-6.18.0-i915-vga-arbiter.patch b/1002-7.0.0-i915-vga-arbiter.patch similarity index 69% rename from 1002-6.18.0-i915-vga-arbiter.patch rename to 1002-7.0.0-i915-vga-arbiter.patch index 974b940..22abed6 100644 --- a/1002-6.18.0-i915-vga-arbiter.patch +++ b/1002-7.0.0-i915-vga-arbiter.patch @@ -1,30 +1,33 @@ -From 8d0bbb8f0f4e901d112be6c50715a6f1a6091e0e Mon Sep 17 00:00:00 2001 +From ed1d33f16fdee0ab9b4e21cd8b93fcf6008cb0c6 Mon Sep 17 00:00:00 2001 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 --- - .../drm/i915/display/intel_display_driver.c | 18 +++++++++-- - .../drm/i915/display/intel_display_driver.h | 1 + + .../drm/i915/display/intel_display_driver.c | 24 ++++++++++-- + .../drm/i915/display/intel_display_driver.h | 4 ++ .../drm/i915/display/intel_display_params.c | 3 ++ .../drm/i915/display/intel_display_params.h | 1 + - drivers/gpu/drm/i915/display/intel_vga.c | 31 +++++++++++++++++++ - drivers/gpu/drm/i915/display/intel_vga.h | 4 +++ - 6 files changed, 55 insertions(+), 3 deletions(-) + drivers/gpu/drm/i915/display/intel_vga.c | 39 +++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_vga.h | 6 +++ + 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 -index cf1c14412..653cb0640 100644 +index 268b1de45..98e1de0ff 100644 --- a/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_driver.h" #include "intel_display_irq.h" +#include "intel_display_params.h" #include "intel_display_power.h" #include "intel_display_types.h" - #include "intel_display_wa.h" -@@ -220,9 +221,11 @@ int intel_display_driver_probe_noirq(struct intel_display *display) + #include "intel_display_utils.h" +@@ -208,9 +209,11 @@ int intel_display_driver_probe_noirq(struct intel_display *display) intel_bios_init(display); @@ -39,45 +42,54 @@ index cf1c14412..653cb0640 100644 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); ++#ifndef VGA_ARBITER_BUILD_XE + /* + * Must do this after fbcon init so that + * vgacon_save_screen() works during the handover. + */ + intel_vga_disable_mem(display); ++#endif /* VGA_ARBITER_BUILD_XE */ + /* Only enable hotplug handling once the fbdev is fully set up. */ 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)) return; ++#ifndef VGA_ARBITER_BUILD_XE + intel_vga_enable_mem(display); ++#endif /* VGA_ARBITER_BUILD_XE */ + flush_workqueue(display->wq.flip); flush_workqueue(display->wq.modeset); 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(); /* flush any delayed tasks or pending work */ ++#ifndef VGA_ARBITER_BUILD_XE + intel_vga_enable_mem(display); ++#endif /* VGA_ARBITER_BUILD_XE */ 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 2966ff91b..ca0dc7577 100644 +index 2966ff91b..939124c3b 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; +@@ -13,6 +13,10 @@ struct drm_modeset_acquire_ctx; struct intel_display; struct pci_dev; ++#ifndef VGA_ARBITER_BUILD_XE +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); void intel_display_driver_init_hw(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."); 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 +++ b/drivers/gpu/drm/i915/display/intel_display_params.h @@ -41,6 +41,7 @@ struct drm_printer; @@ -108,24 +120,31 @@ index b01bc5700..27dd77805 100644 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 6e125564d..dd7e45f89 100644 +index c45c4bbc3..1fef50f2e 100644 --- a/drivers/gpu/drm/i915/display/intel_vga.c +++ b/drivers/gpu/drm/i915/display/intel_vga.c -@@ -13,8 +13,10 @@ - - #include "soc/intel_gmch.h" +@@ -12,8 +12,16 @@ + #include + #include