From 013028353e39fb2aa843d3808ad453e4337ddb8d Mon Sep 17 00:00:00 2001 From: xiota Date: Thu, 25 Dec 2025 02:59:11 +0000 Subject: [PATCH] update i915 vga arbiter patch --- .SRCINFO | 7 +-- ...atch => 1002-6.18.0-i915-vga-arbiter.patch | 61 ++++++------------- PKGBUILD | 6 +- 3 files changed, 25 insertions(+), 49 deletions(-) rename 1002-6.17.0-i915-vga-arbiter.patch => 1002-6.18.0-i915-vga-arbiter.patch (75%) diff --git a/.SRCINFO b/.SRCINFO index cb5f09f..963c74a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -4,9 +4,6 @@ pkgbase = linux-vfio pkgrel = 1 url = https://www.kernel.org arch = x86_64 - arch = x86_64_v2 - arch = x86_64_v3 - arch = x86_64_v4 license = GPL-2.0-or-later makedepends = bc makedepends = cpio @@ -29,7 +26,7 @@ pkgbase = linux-vfio source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.2.tar.sign source = config-6.18.2::https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/raw/6.18.2.arch2-1/config source = 1001-6.14.0-add-acs-overrides.patch - source = 1002-6.17.0-i915-vga-arbiter.patch + source = 1002-6.18.0-i915-vga-arbiter.patch source = https://github.com/archlinux/linux/releases/download/v6.18.2-arch2/linux-v6.18.2-arch2.patch.zst source = https://github.com/archlinux/linux/releases/download/v6.18.2-arch2/linux-v6.18.2-arch2.patch.zst.sig validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 @@ -39,7 +36,7 @@ pkgbase = linux-vfio sha256sums = SKIP sha256sums = SKIP sha256sums = 6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396 - sha256sums = 7aa1b5da09f5d4485bbe07f28725c9750dca544f7c7d66ffb0c822236cc14897 + sha256sums = 1063a64ae704938ea34e2731c357f99c192965cf8980187062589bbf2c2511ec sha256sums = SKIP sha256sums = SKIP diff --git a/1002-6.17.0-i915-vga-arbiter.patch b/1002-6.18.0-i915-vga-arbiter.patch similarity index 75% rename from 1002-6.17.0-i915-vga-arbiter.patch rename to 1002-6.18.0-i915-vga-arbiter.patch index 7a4fe3c..9e4026f 100644 --- a/1002-6.17.0-i915-vga-arbiter.patch +++ b/1002-6.18.0-i915-vga-arbiter.patch @@ -1,23 +1,22 @@ -From c3ef7b73136fa897006d5b11de8a68962000bc22 Mon Sep 17 00:00:00 2001 -From: xiota <> -Date: Fri, 10 Oct 2025 11:24:47 +0000 +From 8d0bbb8f0f4e901d112be6c50715a6f1a6091e0e Mon Sep 17 00:00:00 2001 +From: xiota +Date: Thu, 25 Dec 2025 02:36:25 +0000 Subject: [PATCH] i915-vga-arbiter --- - .../drm/i915/display/intel_display_driver.c | 18 ++++++++-- + .../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 | 34 +++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_vga.c | 31 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_vga.h | 4 +++ - .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 6 ++++ - 7 files changed, 64 insertions(+), 3 deletions(-) + 6 files changed, 55 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 8586ba102..5c8ce811a 100644 +index cf1c14412..653cb0640 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c -@@ -31,6 +31,7 @@ +@@ -32,6 +32,7 @@ #include "intel_display_debugfs.h" #include "intel_display_driver.h" #include "intel_display_irq.h" @@ -25,14 +24,14 @@ index 8586ba102..5c8ce811a 100644 #include "intel_display_power.h" #include "intel_display_types.h" #include "intel_display_wa.h" -@@ -219,9 +220,11 @@ int intel_display_driver_probe_noirq(struct intel_display *display) +@@ -220,9 +221,11 @@ int intel_display_driver_probe_noirq(struct intel_display *display) intel_bios_init(display); - ret = intel_vga_register(display); - if (ret) - goto cleanup_bios; -+ if (!display->params.enable_hd_vgaarb || !HAS_PCH_SPLIT(i915)) { ++ if (!display->params.enable_hd_vgaarb || !HAS_PCH_SPLIT(display)) { + ret = intel_vga_register(display); + if (ret) + goto cleanup_bios; @@ -40,7 +39,7 @@ index 8586ba102..5c8ce811a 100644 intel_psr_dc5_dc6_wa_init(display); -@@ -552,6 +555,12 @@ int intel_display_driver_probe(struct intel_display *display) +@@ -553,6 +556,12 @@ int intel_display_driver_probe(struct intel_display *display) intel_overlay_setup(display); @@ -53,7 +52,7 @@ index 8586ba102..5c8ce811a 100644 /* Only enable hotplug handling once the fbdev is fully set up. */ intel_hpd_init(display); -@@ -602,6 +611,8 @@ void intel_display_driver_remove(struct intel_display *display) +@@ -603,6 +612,8 @@ void intel_display_driver_remove(struct intel_display *display) if (!HAS_DISPLAY(display)) return; @@ -62,7 +61,7 @@ index 8586ba102..5c8ce811a 100644 flush_workqueue(display->wq.flip); flush_workqueue(display->wq.modeset); flush_workqueue(display->wq.cleanup); -@@ -632,6 +643,7 @@ void intel_display_driver_remove_noirq(struct intel_display *display) +@@ -633,6 +644,7 @@ void intel_display_driver_remove_noirq(struct intel_display *display) intel_unregister_dsm_handler(); /* flush any delayed tasks or pending work */ @@ -83,7 +82,7 @@ index 2966ff91b..ca0dc7577 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 75316247e..844176964 100644 +index 2aed110c5..db4fbf207 100644 --- a/drivers/gpu/drm/i915/display/intel_display_params.c +++ b/drivers/gpu/drm/i915/display/intel_display_params.c @@ -102,6 +102,9 @@ intel_display_param_named_unsafe(force_reset_modeset_test, bool, 0400, @@ -97,7 +96,7 @@ index 75316247e..844176964 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 784e6bae8..23e697cbe 100644 +index b01bc5700..27dd77805 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; @@ -109,7 +108,7 @@ index 784e6bae8..23e697cbe 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..3921e27be 100644 +index 6e125564d..dd7e45f89 100644 --- a/drivers/gpu/drm/i915/display/intel_vga.c +++ b/drivers/gpu/drm/i915/display/intel_vga.c @@ -13,8 +13,10 @@ @@ -123,16 +122,15 @@ index 6e125564d..3921e27be 100644 #include "intel_vga.h" #include "intel_vga_regs.h" -@@ -76,6 +78,38 @@ 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); } +void intel_vga_enable_mem(struct intel_display *display) +{ + struct pci_dev *pdev = to_pci_dev(display->drm->dev); -+ struct drm_i915_private *i915 = pdev_to_i915(pdev); + /* Enable VGA memory on Intel HD */ -+ if (display->params.enable_hd_vgaarb && HAS_PCH_SPLIT(i915)) { ++ if (display->params.enable_hd_vgaarb && HAS_PCH_SPLIT(display)) { + vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO); + outb(inb(VGA_MIS_R) | (1 << 1), VGA_MIS_W); + vga_set_legacy_decoding(pdev, VGA_RSRC_LEGACY_IO | @@ -146,9 +144,8 @@ index 6e125564d..3921e27be 100644 +void intel_vga_disable_mem(struct intel_display *display) +{ + struct pci_dev *pdev = to_pci_dev(display->drm->dev); -+ struct drm_i915_private *i915 = pdev_to_i915(pdev); + /* Disable VGA memory on Intel HD */ -+ if (display->params.enable_hd_vgaarb && HAS_PCH_SPLIT(i915)) { ++ if (display->params.enable_hd_vgaarb && HAS_PCH_SPLIT(display)) { + vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO); + outb(inb(VGA_MIS_R) & ~(1 << 1), VGA_MIS_W); + vga_set_legacy_decoding(pdev, VGA_RSRC_LEGACY_IO | @@ -157,7 +154,6 @@ index 6e125564d..3921e27be 100644 + vga_put(pdev, VGA_RSRC_LEGACY_IO); + } +} -+ + void intel_vga_reset_io_mem(struct intel_display *display) { @@ -175,23 +171,6 @@ index 16d699f3b..d91a6cf67 100644 +void intel_vga_disable_mem(struct intel_display *display); + #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 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) - return container_of(dev, struct drm_i915_private, drm); - } - -+static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) -+{ -+ struct drm_device *drm = pci_get_drvdata(pdev); -+ return drm ? to_i915(drm) : NULL; -+} -+ - /* compat platform checks only for soc/ usage */ - #define IS_PLATFORM(xe, x) ((xe)->info.platform == x) - #define IS_I915G(dev_priv) (dev_priv && 0) -- -2.51.0 +2.52.0 diff --git a/PKGBUILD b/PKGBUILD index 7f32b3c..0226c5f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -31,7 +31,7 @@ pkgrel=1 pkgdesc='Linux' url='https://www.kernel.org' license=('GPL-2.0-or-later') -arch=('x86_64' 'x86_64_v2' 'x86_64_v3' 'x86_64_v4') +arch=('x86_64') makedepends=( bc @@ -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.17.0-i915-vga-arbiter.patch # updated from https://lkml.org/lkml/2014/5/9/517 + 1002-6.18.0-i915-vga-arbiter.patch # updated from https://lkml.org/lkml/2014/5/9/517 ) sha256sums+=( '6bca6264da6717402ec89ec5ed06b8997fe3df7a20a3a57eb5a85f64e12bc396' - '7aa1b5da09f5d4485bbe07f28725c9750dca544f7c7d66ffb0c822236cc14897' + '1063a64ae704938ea34e2731c357f99c192965cf8980187062589bbf2c2511ec' ) fi