Hello_User/linux-vfio
1
0
Fork 0
forked from AUR/linux-vfio
Code Issues Pull Requests Projects Releases Wiki Activity

basic 5.10.x changes at 5.10.2-test

Browse Source
This commit is contained in:
Katelyn Schiesser 2020-12-30 23:44:46 -08:00
parent 191b51b178
commit 584f0d9dcf
5 changed files with 415 additions and 1336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.SRCINFO
View File

@ -1,8 +1,8 @@
pkgbase = linux-vfio
pkgdesc = Linux
pkgver = 5.9.14.arch1
pkgver = 5.10.2.arch1
pkgrel = 1
url = https://git.archlinux.org/linux.git/log/?h=v5.9.14-arch1
url = https://git.archlinux.org/linux.git/log/?h=v5.10.2-arch1
arch = x86_64
license = GPL2
makedepends = bc
@ -20,19 +20,17 @@ pkgbase = linux-vfio
makedepends = imagemagick
makedepends = git
options = !strip
source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.9.14-arch1
source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.10.2-arch1
source = config
source = add-acs-overrides.patch
source = i915-vga-arbiter.patch
source = sphinx-workaround.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
sha256sums = SKIP
sha256sums = e8e9d05bc4076915c0b8f4d1d7d8889b6c446a9853a5d5ef09df47689164403b
sha256sums = 44dc46859652fef332b9223dc4de93e6a67877921711259540fbf235319538ac
sha256sums = 5ed25e82b59462d91a7869c5aca56045476f3c29c217bfa68851cc6d8678a503
sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
sha256sums = d8b28f67a0f0bc56e5de858141dee3607fbac48eac41b0e9f7f69685f7475b53
sha256sums = d3723da5cff1dce0a29bb704264dacccab559373a00fbbe97b12745dcf144b3d
sha256sums = 167dbad8da63a70df243273b8a246357215f832406063d2637d87a1ae2b6f1bb
pkgname = linux-vfio
pkgdesc = The Linux kernel and modules

10
PKGBUILD
View File

@ -4,7 +4,7 @@
# Upstream: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=linux-vfio
pkgver=5.9.14.arch1
pkgver=5.10.2.arch1
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@ -23,7 +23,6 @@ source=(
config # the main kernel config file
add-acs-overrides.patch
i915-vga-arbiter.patch
sphinx-workaround.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@ -31,10 +30,9 @@ validpgpkeys=(
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
'e8e9d05bc4076915c0b8f4d1d7d8889b6c446a9853a5d5ef09df47689164403b'
'44dc46859652fef332b9223dc4de93e6a67877921711259540fbf235319538ac'
'5ed25e82b59462d91a7869c5aca56045476f3c29c217bfa68851cc6d8678a503'
'8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c')
'd8b28f67a0f0bc56e5de858141dee3607fbac48eac41b0e9f7f69685f7475b53'
'd3723da5cff1dce0a29bb704264dacccab559373a00fbbe97b12745dcf144b3d'
'167dbad8da63a70df243273b8a246357215f832406063d2637d87a1ae2b6f1bb')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase

8
add-acs-overrides.patch
View File

@ -47,10 +47,10 @@ your customers the hassle of this boot option.
---
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index fb95fad81c79..0a1e5281809a 100644
index f6a1513dfb76..3c3e25cdc90e 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3568,6 +3568,14 @@
@@ -3629,6 +3629,14 @@
nomsi [MSI] If the PCI_MSI kernel config parameter is
enabled, this kernel boot option can be used to
disable the use of MSI interrupts system-wide.
@ -66,7 +66,7 @@ index fb95fad81c79..0a1e5281809a 100644
Safety option to keep boot IRQs enabled. This
should never be necessary.
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 2ea61abd5830..025974dfc10a 100644
index f70692ac79c5..e1208a614703 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
@ -176,7 +176,7 @@ index 2ea61abd5830..025974dfc10a 100644
/*
* Decoding should be disabled for a PCI device during BAR sizing to avoid
* conflict. But doing so may cause problems on host bridge and perhaps other
@@ -4824,6 +4924,8 @@ static const struct pci_dev_acs_enabled {
@@ -4769,6 +4869,8 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs },
/* Zhaoxin Root/Downstream Ports */
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },

1636
config
View File

File diff suppressed because it is too large Load Diff

83
i915-vga-arbiter.patch
View File

@ -37,10 +37,38 @@ until after vgacon->fbcon handoff.
---
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 26996e1839e2..2569e2a91e6b 100644
index aabf09f89cad..528c6886a0b5 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -18665,6 +18665,7 @@ static void intel_hpd_poll_fini(struct drm_i915_private *i915)
@@ -17887,9 +17887,11 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
intel_bios_init(i915);
- ret = intel_vga_register(i915);
- if (ret)
- goto cleanup_bios;
+ if (!i915_modparams.enable_hd_vgaarb || !HAS_PCH_SPLIT(i915)) {
+ ret = intel_vga_register(i915);
+ if (ret)
+ goto cleanup_bios;
+ }
/* FIXME: completely on the wrong abstraction layer */
intel_power_domains_init_hw(i915, false);
@@ -18048,6 +18050,12 @@ int intel_modeset_init(struct drm_i915_private *i915)
if (ret)
return ret;
+ /*
+ * Must do this after fbcon init so that
+ * vgacon_save_screen() works during the handover.
+ */
+ intel_vga_disable_mem(i915);
+
/* Only enable hotplug handling once the fbdev is fully set up. */
intel_hpd_init(i915);
@@ -18895,6 +18903,7 @@ static void intel_hpd_poll_fini(struct drm_i915_private *i915)
/* part #1: call before irq uninstall */
void intel_modeset_driver_remove(struct drm_i915_private *i915)
{
@ -49,10 +77,10 @@ index 26996e1839e2..2569e2a91e6b 100644
flush_workqueue(i915->modeset_wq);
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 3a06f72c9859..8c034bbf455a 100644
index d10b7c8cde3f..3daaa0bd3b60 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -507,6 +507,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
@@ -514,6 +514,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
void lpt_pch_enable(const struct intel_crtc_state *crtc_state);
void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv);
void lpt_disable_iclkip(struct drm_i915_private *dev_priv);
@ -123,58 +151,25 @@ index ba5b55b917f0..7e2af7924e99 100644
+void intel_vga_disable_mem(struct drm_i915_private *i915);
+
#endif /* __INTEL_VGA_H__ */
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 34ee12f3f02d..a46477eb9e34 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -233,9 +233,11 @@ static int i915_driver_modeset_probe_noirq(struct drm_i915_private *i915)
intel_bios_init(i915);
- ret = intel_vga_register(i915);
- if (ret)
- goto cleanup_bios;
+ if (!i915_modparams.enable_hd_vgaarb || !HAS_PCH_SPLIT(i915)) {
+ ret = intel_vga_register(i915);
+ if (ret)
+ goto cleanup_bios;
+ }
intel_power_domains_init_hw(i915, false);
@@ -280,6 +282,12 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915)
if (ret)
goto cleanup_gem;
+ /*
+ * Must do this after fbcon init so that
+ * vgacon_save_screen() works during the handover.
+ */
+ intel_vga_disable_mem(i915);
+
/* Only enable hotplug handling once the fbdev is fully set up. */
intel_hpd_init(i915);
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 8d8db9ff0a48..c187e96aa597 100644
index 7f139ea4a90b..f23476551569 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -135,6 +135,9 @@ i915_param_named_unsafe(invert_brightness, int, 0400,
@@ -140,6 +140,9 @@ i915_param_named_unsafe(invert_brightness, int, 0400,
i915_param_named(disable_display, bool, 0400,
"Disable display (default: false)");
"Disable display (default: false)");
+i915_param_named(enable_hd_vgaarb, bool, 0444,
+ "Enable support for VGA arbitration on Intel HD IGD. (default: false)");
+
i915_param_named(mmio_debug, int, 0400,
"Enable the MMIO debug code for the first N failures (default: off). "
"This may negatively affect performance.");
"Enable the MMIO debug code for the first N failures (default: off). "
"This may negatively affect performance.");
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 4f21bfffbf0e..3f3bfb5eff5d 100644
index 330c03e2b4f7..b44a4b7dba4d 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -70,6 +70,7 @@ struct drm_printer;
@@ -72,6 +72,7 @@ struct drm_printer;
param(char *, force_probe, CONFIG_DRM_I915_FORCE_PROBE, 0400) \
param(unsigned long, fake_lmem_start, 0, 0400) \
/* leave bools at the end to not create holes */ \