mirror of
https://aur.archlinux.org/linux-vfio.git
synced 2025-09-13 18:56:13 +00:00
update i915 vga arbiter patch
This commit is contained in:
xiota
179
1002-6.16.0-i915-vga-arbiter.patch
Normal file
179
1002-6.16.0-i915-vga-arbiter.patch
Normal file
@@ -0,0 +1,179 @@
|
||||
From c542ded46a787b1a08be300506b2043a01627a86 Mon Sep 17 00:00:00 2001
|
||||
From: xiota <aur@mentalfossa.com>
|
||||
Date: Sun, 17 Aug 2025 10:49:24 +0000
|
||||
Subject: [PATCH 2/2] i915-vga-arbiter
|
||||
|
||||
---
|
||||
.../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 +++
|
||||
6 files changed, 57 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
|
||||
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
|
||||
@@ -30,6 +30,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"
|
||||
@@ -223,9 +224,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)) {
|
||||
+ ret = intel_vga_register(display);
|
||||
+ if (ret)
|
||||
+ goto cleanup_bios;
|
||||
+ }
|
||||
|
||||
intel_psr_dc5_dc6_wa_init(display);
|
||||
|
||||
@@ -538,6 +541,12 @@ int intel_display_driver_probe(struct intel_display *display)
|
||||
|
||||
intel_overlay_setup(display);
|
||||
|
||||
+ /*
|
||||
+ * Must do this after fbcon init so that
|
||||
+ * vgacon_save_screen() works during the handover.
|
||||
+ */
|
||||
+ intel_vga_disable_mem(display);
|
||||
+
|
||||
/* 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)
|
||||
if (!HAS_DISPLAY(display))
|
||||
return;
|
||||
|
||||
+ intel_vga_enable_mem(display);
|
||||
+
|
||||
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)
|
||||
intel_unregister_dsm_handler();
|
||||
|
||||
/* flush any delayed tasks or pending work */
|
||||
+ intel_vga_enable_mem(display);
|
||||
flush_workqueue(i915->unordered_wq);
|
||||
|
||||
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
|
||||
--- 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;
|
||||
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 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
|
||||
--- 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,
|
||||
intel_display_param_named(disable_display, bool, 0400,
|
||||
"Disable display (default: false)");
|
||||
|
||||
+intel_display_param_named(enable_hd_vgaarb, bool, 0400,
|
||||
+ "Enable support for VGA arbitration on Intel HD IGD. (default: false)");
|
||||
+
|
||||
intel_display_param_named(verbose_state_checks, bool, 0400,
|
||||
"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
|
||||
--- 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;
|
||||
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, 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
|
||||
--- a/drivers/gpu/drm/i915/display/intel_vga.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_vga.c
|
||||
@@ -13,9 +13,11 @@
|
||||
|
||||
#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)
|
||||
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)) {
|
||||
+ 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 |
|
||||
+ VGA_RSRC_LEGACY_MEM |
|
||||
+ VGA_RSRC_NORMAL_IO |
|
||||
+ VGA_RSRC_NORMAL_MEM);
|
||||
+ vga_put(pdev, VGA_RSRC_LEGACY_IO);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+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)) {
|
||||
+ 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 |
|
||||
+ VGA_RSRC_NORMAL_IO |
|
||||
+ VGA_RSRC_NORMAL_MEM);
|
||||
+ 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
|
||||
--- 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);
|
||||
int intel_vga_register(struct intel_display *display);
|
||||
void intel_vga_unregister(struct intel_display *display);
|
||||
|
||||
+/* i915 vga arb patch */
|
||||
+void intel_vga_enable_mem(struct intel_display *display);
|
||||
+void intel_vga_disable_mem(struct intel_display *display);
|
||||
+
|
||||
#endif /* __INTEL_VGA_H__ */
|
||||
--
|
||||
2.50.1
|
||||
|
||||
Reference in New Issue
Block a user