upg linux 5.15.123
This commit is contained in:
parent
df4a66cadc
commit
e6fe252a01
|
|
@ -6,13 +6,13 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgbase=linux
|
||||
pkgver=5.15.120
|
||||
pkgver=5.15.123
|
||||
pkgrel=01
|
||||
pkgdesc='Linux LTS 5.15 w/o zstd ipv6'
|
||||
pkgdesc='Linux LTS 5.15 w/o zstd ipv6 + vfio i915 patch'
|
||||
url="https://www.kernel.org/"
|
||||
makedepends=(
|
||||
bc libelf pahole cpio perl tar xz kmod
|
||||
makedepends=(bc libelf pahole cpio perl tar xz kmod
|
||||
xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick)
|
||||
# texlive-latexextra) ## for building docs
|
||||
options=('!strip')
|
||||
_srcname=linux-$pkgver
|
||||
source=(
|
||||
|
|
@ -23,6 +23,7 @@ source=(
|
|||
0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
|
||||
0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
|
||||
0005-lg-laptop-Recognize-more-models.patch
|
||||
i915-vga-arbiter.patch
|
||||
sha256sums::https://cdn.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc)
|
||||
|
||||
export KBUILD_BUILD_HOST=joborun
|
||||
|
|
@ -59,7 +60,7 @@ build() {
|
|||
cd $_srcname
|
||||
make all
|
||||
}
|
||||
# make htmldocs all ## Add this into the build to make docs and uncomment the package section
|
||||
## make htmldocs all ## Add this into the build to make docs and uncomment the package section
|
||||
|
||||
_package() {
|
||||
pkgdesc="The $pkgdesc kernel and modules w/o zstd ipv6 touchscreen"
|
||||
|
|
@ -110,7 +111,7 @@ _package-headers() {
|
|||
# add xfs and shmem for aufs building
|
||||
mkdir -p "$builddir"/{fs/xfs,mm}
|
||||
|
||||
# # required when DEBUG_INFO_BTF_MODULES is enabled
|
||||
# required when DEBUG_INFO_BTF_MODULES is enabled
|
||||
install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
|
||||
|
||||
echo "Installing headers..."
|
||||
|
|
@ -212,18 +213,19 @@ validpgpkeys=(ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
|
|||
647F28654894E3BD457199BE38DBBDC86092693E) # Greg Kroah-Hartman
|
||||
|
||||
# https://cdn.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc --> sha256sums
|
||||
# 6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6 linux-5.15.120.tar.xz
|
||||
# 2de69544a12e6a059163c58fc901c13bcf22e8cac39c66b56f8fbb633399bf93 linux-5.15.123.tar.xz
|
||||
|
||||
sha256sums=(6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6 # linux-5.15.120.tar.xz
|
||||
7eedd242e441bd78bfb46d22441a452c0a0623425fec7e91243ac61be6d2f1dd # linux-5.15.120.tar.sign
|
||||
11bac3c8febe8e0f728e6f70240dc8e7a48962ff5ecfacd5fbcff0dc3c4e406f # config
|
||||
sha256sums=(2de69544a12e6a059163c58fc901c13bcf22e8cac39c66b56f8fbb633399bf93 # linux-5.15.123.tar.xz
|
||||
7b1117db89f129940009f4fead7324f7eb0c075e11a79134558e5a7327585761 # linux-5.15.123.tar.sign
|
||||
84ce6c7112bfe4cc21552e9d087eba8cea0ad2b42876fd88e8e385c8ed62dde0 # config
|
||||
3b5cfc9ca9cf778ea2c4b619b933cda26519969df2d764b5a687f63cf59974cd # 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
|
||||
c175fbb141c3cec013c799f694d88310375ac5456042f6a4a1adc7667836d786 # 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
|
||||
8357f000b2b622e73dcfd41c2bad42b5e99fffe8f7ee64f774aa771f86cef43c # 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
|
||||
5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde # 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
|
||||
067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9 # 0005-lg-laptop-Recognize-more-models.patch
|
||||
7069ebae073f5856523f7fd4478b678472da65ae568e68792d1335db34af2154) # sha256sums
|
||||
856230cfbdc2bb53a4920dfbcb6fb2d58427b7b184e5f94e21f08011d0a2fcc6 # i915-vga-arbiter.patch
|
||||
4d526a76636cc3cf23f9b5b2dd13064d7e885e620f800521158244195e0aff40) # sha256sums
|
||||
|
||||
## b9c983b6115afcaee8e970882db9244b2855eae0e39550c47addcf192f34f8a6 linux-5.15.120-01-x86_64.pkg.tar.lz
|
||||
## e3d8065c3884e6eecc5eb982e6f62e92e4d768473199c0744ad2bc0d33c7708b linux-headers-5.15.120-01-x86_64.pkg.tar.lz
|
||||
## 5d4e516dbc6219afd3b50e2fc148d7dccb1aaed39f1329fe533b19e66390945d linux-5.15.123-01-x86_64.pkg.tar.lz
|
||||
## 39663e8c8957c05328435080cb3df547b22f8e83e326a8756666a2ca3e7874ba linux-headers-5.15.123-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -209,3 +209,4 @@ for _p in "${pkgname[@]}"; do
|
|||
done
|
||||
|
||||
# vim:set ts=8 sts=2 sw=2 et:
|
||||
fd349d5d254874be306c5c7eb4f5865f0562a64cf3f86abeb9b7fbba90c20539 config
|
||||
|
|
|
|||
|
|
@ -270,3 +270,4 @@ if [ "${CARCH}" = "i486" -o "${CARCH}" = "i686" -o "${CARCH}" = "pentium4" ]; t
|
|||
makedepends=(${makedepends[@]//imagemagick/})
|
||||
makedepends=(${makedepends[@]//texlive-latexextra/})
|
||||
fi
|
||||
fd349d5d254874be306c5c7eb4f5865f0562a64cf3f86abeb9b7fbba90c20539 config
|
||||
|
|
|
|||
|
|
@ -270,3 +270,4 @@ if [ "${CARCH}" = "i486" -o "${CARCH}" = "i686" -o "${CARCH}" = "pentium4" ]; t
|
|||
makedepends=(${makedepends[@]//imagemagick/})
|
||||
makedepends=(${makedepends[@]//texlive-latexextra/})
|
||||
fi
|
||||
fd349d5d254874be306c5c7eb4f5865f0562a64cf3f86abeb9b7fbba90c20539 config
|
||||
|
|
|
|||
27
linux/config
27
linux/config
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 5.15.120 Kernel Configuration
|
||||
# Linux/x86 5.15.123 Kernel Configuration
|
||||
#
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230501"
|
||||
|
|
@ -105,7 +105,6 @@ CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
|
|||
CONFIG_TICK_ONESHOT=y
|
||||
CONFIG_NO_HZ_COMMON=y
|
||||
# CONFIG_HZ_PERIODIC is not set
|
||||
# CONFIG_NO_HZ_IDLE is not set
|
||||
CONFIG_NO_HZ_FULL=y
|
||||
CONFIG_CONTEXT_TRACKING_USER=y
|
||||
# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set
|
||||
|
|
@ -904,6 +903,7 @@ CONFIG_BLK_RQ_ALLOC_TIME=y
|
|||
CONFIG_BLK_SCSI_REQUEST=y
|
||||
CONFIG_BLK_CGROUP_RWSTAT=y
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
CONFIG_BLK_DEV_BSG_COMMON=y
|
||||
CONFIG_BLK_DEV_BSGLIB=y
|
||||
CONFIG_BLK_DEV_INTEGRITY=y
|
||||
CONFIG_BLK_DEV_INTEGRITY_T10=y
|
||||
|
|
@ -5521,9 +5521,9 @@ CONFIG_REGULATOR_WM8350=m
|
|||
CONFIG_REGULATOR_WM8400=m
|
||||
CONFIG_REGULATOR_WM8994=m
|
||||
CONFIG_RC_CORE=y
|
||||
CONFIG_BPF_LIRC_MODE2=y
|
||||
CONFIG_LIRC=y
|
||||
CONFIG_RC_MAP=m
|
||||
CONFIG_LIRC=y
|
||||
CONFIG_BPF_LIRC_MODE2=y
|
||||
CONFIG_RC_DECODERS=y
|
||||
CONFIG_IR_NEC_DECODER=m
|
||||
CONFIG_IR_RC5_DECODER=m
|
||||
|
|
@ -5669,13 +5669,13 @@ CONFIG_USB_GSPCA_SN9C2028=m
|
|||
CONFIG_USB_GSPCA_SN9C20X=m
|
||||
CONFIG_USB_GSPCA_SONIXB=m
|
||||
CONFIG_USB_GSPCA_SONIXJ=m
|
||||
CONFIG_USB_GSPCA_SPCA1528=m
|
||||
CONFIG_USB_GSPCA_SPCA500=m
|
||||
CONFIG_USB_GSPCA_SPCA501=m
|
||||
CONFIG_USB_GSPCA_SPCA505=m
|
||||
CONFIG_USB_GSPCA_SPCA506=m
|
||||
CONFIG_USB_GSPCA_SPCA508=m
|
||||
CONFIG_USB_GSPCA_SPCA561=m
|
||||
CONFIG_USB_GSPCA_SPCA1528=m
|
||||
CONFIG_USB_GSPCA_SQ905=m
|
||||
CONFIG_USB_GSPCA_SQ905C=m
|
||||
CONFIG_USB_GSPCA_SQ930X=m
|
||||
|
|
@ -5767,12 +5767,12 @@ CONFIG_DVB_USB_ANYSEE=m
|
|||
CONFIG_DVB_USB_AU6610=m
|
||||
CONFIG_DVB_USB_AZ6007=m
|
||||
CONFIG_DVB_USB_CE6230=m
|
||||
CONFIG_DVB_USB_DVBSKY=m
|
||||
CONFIG_DVB_USB_EC168=m
|
||||
CONFIG_DVB_USB_GL861=m
|
||||
CONFIG_DVB_USB_LME2510=m
|
||||
CONFIG_DVB_USB_MXL111SF=m
|
||||
CONFIG_DVB_USB_RTL28XXU=m
|
||||
CONFIG_DVB_USB_DVBSKY=m
|
||||
CONFIG_DVB_USB_ZD1301=m
|
||||
CONFIG_DVB_TTUSB_BUDGET=m
|
||||
CONFIG_DVB_TTUSB_DEC=m
|
||||
|
|
@ -8512,7 +8512,7 @@ CONFIG_INTEL_SCU=y
|
|||
CONFIG_INTEL_SCU_PCI=y
|
||||
CONFIG_INTEL_SCU_PLATFORM=m
|
||||
CONFIG_INTEL_SCU_IPC_UTIL=m
|
||||
INTEL_TELEMETRY=n
|
||||
CONFIG_INTEL_TELEMETRY=n
|
||||
CONFIG_PMC_ATOM=y
|
||||
CONFIG_CHROME_PLATFORMS=y
|
||||
CONFIG_CHROMEOS_LAPTOP=m
|
||||
|
|
@ -9467,8 +9467,8 @@ CONFIG_SLIMBUS=m
|
|||
CONFIG_SLIM_QCOM_CTRL=m
|
||||
CONFIG_INTERCONNECT=y
|
||||
CONFIG_COUNTER=m
|
||||
CONFIG_INTEL_QEP=m
|
||||
CONFIG_INTERRUPT_CNT=m
|
||||
CONFIG_INTEL_QEP=m
|
||||
CONFIG_MOST=m
|
||||
CONFIG_MOST_USB_HDM=m
|
||||
CONFIG_MOST_CDEV=m
|
||||
|
|
@ -9971,7 +9971,7 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
|
|||
CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
|
||||
# CONFIG_INIT_STACK_ALL_PATTERN is not set
|
||||
CONFIG_INIT_STACK_ALL_ZERO=y
|
||||
# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
|
||||
CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE=y
|
||||
# CONFIG_GCC_PLUGIN_STACKLEAK is not set
|
||||
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
|
||||
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
|
||||
|
|
@ -10252,9 +10252,8 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
|
|||
#
|
||||
CONFIG_CRYPTO_LIB_AES=y
|
||||
CONFIG_CRYPTO_LIB_ARC4=m
|
||||
# CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
|
||||
# CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
|
||||
CONFIG_CRYPTO_LIB_BLAKE2S=m
|
||||
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
|
||||
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
|
||||
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
|
||||
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
|
||||
CONFIG_CRYPTO_LIB_CHACHA=m
|
||||
|
|
@ -10282,7 +10281,7 @@ CONFIG_CRC32_SLICEBY8=y
|
|||
# CONFIG_CRC32_SLICEBY4 is not set
|
||||
# CONFIG_CRC32_SARWATE is not set
|
||||
# CONFIG_CRC32_BIT is not set
|
||||
CONFIG_CRC64=y
|
||||
CONFIG_CRC64=m
|
||||
CONFIG_CRC4=m
|
||||
CONFIG_CRC7=m
|
||||
CONFIG_LIBCRC32C=m
|
||||
|
|
@ -10421,6 +10420,8 @@ CONFIG_SYMBOLIC_ERRNAME=y
|
|||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
# end of printk and dmesg options
|
||||
|
||||
CONFIG_AS_HAS_NON_CONST_LEB128=y
|
||||
|
||||
#
|
||||
# Compile-time checks and compiler options
|
||||
#
|
||||
|
|
|
|||
|
|
@ -0,0 +1,193 @@
|
|||
From a59b6ecac96eab5e80fa5ee918ddbc8e2fad3a7a Mon Sep 17 00:00:00 2001
|
||||
From: Mark Weiman <mark.weiman@markzz.com>
|
||||
Date: Wed, 27 Jan 2021 13:28:46 -0500
|
||||
Subject: [PATCH] i915: Add module option to support VGA arbiter on HD devices
|
||||
(5.14)
|
||||
|
||||
Updated version of Mark Weiman's i915 patch for 5.14.
|
||||
|
||||
Original patch messages follow.
|
||||
---
|
||||
This is an updated version of Alex Williamson's patch from:
|
||||
https://lkml.org/lkml/2014/5/9/517
|
||||
|
||||
I don't have i915 graphics, so this is completely untested.
|
||||
|
||||
Original commit message follows:
|
||||
---
|
||||
Commit 81b5c7bc found that the current VGA arbiter support in i915
|
||||
only works for ancient GMCH-based IGD devices and attempted to update
|
||||
support for newer HD devices. Unfortunately newer devices cannot
|
||||
completely opt-out of VGA arbitration like the old devices could.
|
||||
The VGA I/O space cannot be disabled internally. The only way to
|
||||
route VGA I/O elsewhere is by disabling I/O at the device PCI command
|
||||
register. This means that with commit 81b5c7bc and multiple VGA
|
||||
adapters, the VGA arbiter will report that multiple VGA devices are
|
||||
participating in arbitration, Xorg will notice this and disable DRI.
|
||||
Therefore, 81b5c7bc was reverted because DRI is more important than
|
||||
being correct.
|
||||
|
||||
There is however an actual need for i915 to correctly participate in
|
||||
VGA arbitration; VGA device assignment. If we want to use VFIO to
|
||||
assign a VGA device to a virtual machine, we need to be able to
|
||||
access the VGA resources of that device. By adding an i915 module
|
||||
option we can allow i915 to continue with its charade by default, but
|
||||
also allow an easy path for users who require working VGA arbitration.
|
||||
Hopefully Xorg can someday be taught to behave better with multiple
|
||||
VGA devices.
|
||||
|
||||
This also rolls in reverted commit 6e1b4fda, which corrected an
|
||||
ordering issue with 81b5c7bc by delaying the disabling of VGA memory
|
||||
until after vgacon->fbcon handoff.
|
||||
---
|
||||
drivers/gpu/drm/i915/display/intel_display.c | 15 +++++++--
|
||||
drivers/gpu/drm/i915/display/intel_display.h | 1 +
|
||||
drivers/gpu/drm/i915/display/intel_vga.c | 32 ++++++++++++++++++++
|
||||
drivers/gpu/drm/i915/display/intel_vga.h | 4 +++
|
||||
drivers/gpu/drm/i915/i915_params.c | 3 ++
|
||||
drivers/gpu/drm/i915/i915_params.h | 1 +
|
||||
6 files changed, 53 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
|
||||
index aabf09f89cad..528c6886a0b5 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_display.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_display.c
|
||||
@@ -12304,9 +12304,11 @@
|
||||
|
||||
intel_bios_init(i915);
|
||||
|
||||
- ret = intel_vga_register(i915);
|
||||
- if (ret)
|
||||
+ 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);
|
||||
@@ -12476,6 +12478,12 @@
|
||||
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);
|
||||
intel_hpd_poll_disable(i915);
|
||||
@@ -13375,6 +13383,7 @@
|
||||
if (!HAS_DISPLAY(i915))
|
||||
return;
|
||||
|
||||
+ intel_vga_enable_mem(i915);
|
||||
flush_workqueue(i915->flip_wq);
|
||||
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 d10b7c8cde3f..3daaa0bd3b60 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_display.h
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_display.h
|
||||
@@ -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);
|
||||
+extern void intel_vga_disable_mem(struct drm_i915_private *dev_priv);
|
||||
void intel_init_display_hooks(struct drm_i915_private *dev_priv);
|
||||
unsigned int intel_fb_xy_to_linear(int x, int y,
|
||||
const struct intel_plane_state *state,
|
||||
diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
|
||||
index be333699c515..a76aa52cde76 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_vga.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_vga.c
|
||||
@@ -41,6 +41,37 @@ void intel_vga_disable(struct drm_i915_private *dev_priv)
|
||||
intel_de_posting_read(dev_priv, vga_reg);
|
||||
}
|
||||
|
||||
+
|
||||
+void intel_vga_enable_mem(struct drm_i915_private *dev_priv)
|
||||
+{
|
||||
+ struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
|
||||
+
|
||||
+ /* Enable VGA memory on Intel HD */
|
||||
+ if (i915_modparams.enable_hd_vgaarb && HAS_PCH_SPLIT(dev_priv)) {
|
||||
+ vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
|
||||
+ outb(inb(VGA_MSR_READ) | VGA_MSR_MEM_EN, VGA_MSR_WRITE);
|
||||
+ 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 drm_i915_private *dev_priv)
|
||||
+{
|
||||
+ struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
|
||||
+ /* Disable VGA memory on Intel HD */
|
||||
+ if (i915_modparams.enable_hd_vgaarb && HAS_PCH_SPLIT(dev_priv)) {
|
||||
+ vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
|
||||
+ outb(inb(VGA_MSR_READ) & ~VGA_MSR_MEM_EN, VGA_MSR_WRITE);
|
||||
+ 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_redisable_power_on(struct drm_i915_private *dev_priv)
|
||||
{
|
||||
i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv);
|
||||
@@ -49,6 +80,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv)
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"Something enabled VGA plane, disabling it\n");
|
||||
intel_vga_disable(dev_priv);
|
||||
+ intel_vga_disable_mem(dev_priv);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/display/intel_vga.h b/drivers/gpu/drm/i915/display/intel_vga.h
|
||||
index ba5b55b917f0..7e2af7924e99 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_vga.h
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_vga.h
|
||||
@@ -15,4 +15,8 @@ void intel_vga_redisable_power_on(struct drm_i915_private *i915);
|
||||
int intel_vga_register(struct drm_i915_private *i915);
|
||||
void intel_vga_unregister(struct drm_i915_private *i915);
|
||||
|
||||
+/* i915 vga arb patch */
|
||||
+void intel_vga_enable_mem(struct drm_i915_private *i915);
|
||||
+void intel_vga_disable_mem(struct drm_i915_private *i915);
|
||||
+
|
||||
#endif /* __INTEL_VGA_H__ */
|
||||
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
|
||||
index 7f139ea4a90b..f23476551569 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_params.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_params.c
|
||||
@@ -140,6 +140,9 @@ i915_param_named_unsafe(invert_brightness, int, 0400,
|
||||
i915_param_named(disable_display, bool, 0400,
|
||||
"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.");
|
||||
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
|
||||
index 330c03e2b4f7..b44a4b7dba4d 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_params.h
|
||||
+++ b/drivers/gpu/drm/i915/i915_params.h
|
||||
@@ -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 */ \
|
||||
+ param(bool, enable_hd_vgaarb, false, 0600) \
|
||||
param(bool, enable_hangcheck, true, 0600) \
|
||||
param(bool, load_detect_test, false, 0600) \
|
||||
param(bool, force_reset_modeset_test, false, 0600) \
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
|
@ -336,6 +336,8 @@ da55c90cea583779182d12cf338f321ad0c22b02c5138a5940e3e2975117ad15 ChangeLog-5.4.
|
|||
a8edf2cc9038b1320dc8bdda31727d888633f00c079bb62cdea0c16b7a1e2a58 ChangeLog-5.4.247
|
||||
651041da52d56233b5364a2f63ee2b12aaffbe9e91ea931b3e34fcce4ac350ca ChangeLog-5.4.248
|
||||
7b6f888c2fda34e06845717076395284d5e80ad7c2f1989a2d56071982bf3096 ChangeLog-5.4.249
|
||||
e0ba691027fec388f6476284f54857d8d0712c9ce6ca6d6d77b868927034b9d4 ChangeLog-5.4.250
|
||||
6e4664be103aeebcd2e97b718972ce68efbac1973c91540a024b86db0b85e765 ChangeLog-5.4.251
|
||||
b06ab2b602fc03f3a5ee3e5bbb93b4d1a6ed33f09440ba57fc2f90f7f5339576 ChangeLog-5.5
|
||||
70703385d5a64eb604eb7db844319fd9b6908aea346d2488b5860a7982d6e591 ChangeLog-5.5.1
|
||||
e77d916573c237b1422b89845f520f416c4a58df7f869eec401a68c6135b9842 ChangeLog-5.5.2
|
||||
|
|
@ -619,6 +621,8 @@ b6ff91e7b6056250aadd6b8672f95d312529c44f1a7f4f0b55b7d1c490fc0b60 ChangeLog-5.10
|
|||
1dacc8b3ace6331af89b7cd79ddcb9dafc71adf27b25cb3d872efc3d57253e98 ChangeLog-5.10.184
|
||||
2445d6a2eebb7c5e297eb4fa5ef90d655a38d75f4ef625ad3332b10c1227579e ChangeLog-5.10.185
|
||||
7f84c9633488769f4cf7282a4796f84621dacd6427e4addd511dea24d7aee7ef ChangeLog-5.10.186
|
||||
b0543d7e566ec3917cb739842b2cbab815b72b86d0f6a176b5b1c43f002a31cd ChangeLog-5.10.187
|
||||
6f6b4d4fe46275aa4d9e033dfd48ba3187d9f3e626362543965a4e53e84f30a0 ChangeLog-5.10.188
|
||||
1b67a4eb91d8009cf5b47521caae0ff1c904e4fb0ec95e4c2562b61a772f3e16 ChangeLog-5.11
|
||||
61e4714a1413779d4c9bf707de34ca7146714eb787a9078bcd51c8c18489dc7e ChangeLog-5.11.1
|
||||
548b64c633da18f18021e72b4c9ba3212d699df6c56e9496277285283df300f5 ChangeLog-5.11.2
|
||||
|
|
@ -825,6 +829,9 @@ cc18a514a6242721a774d734023d2a561cd9d313acede059dc0f7394d99bffb2 ChangeLog-5.15
|
|||
1acb467127e304ca238e3a5a7ffe6291a1bb9459270c48adb15396754ceeec37 ChangeLog-5.15.118
|
||||
d8b6759f7ecb381b1489b3fc9db60de2da2b777351afcaf17ac62e87cb4653c7 ChangeLog-5.15.119
|
||||
f155d090c8d6d78aeaae0edee2b71b8b8f4518d84779557e0fd82b1987aa09ef ChangeLog-5.15.120
|
||||
2ff391755ac546ca68894d5d2cc9640662ddd4f7784f76b9c26de345496b9ac4 ChangeLog-5.15.121
|
||||
354cefd1a29ce461ff873d5349bc49419b4d48d563ff5ae71d874a8b4bc46c11 ChangeLog-5.15.122
|
||||
55907f2a4881b569d2b629f66d2ba6f66fcb42dc369ffafbabd441dafff8ca0d ChangeLog-5.15.123
|
||||
8973679b5da41c4f9f3a12edf2598bcea3ee4a4988a179f36c4c8d4ec9c96e6f ChangeLog-5.16
|
||||
694254b586ab67c329bc79a3b0a60f74771b97aebe314aff66c944ec454acb98 ChangeLog-5.16.1
|
||||
5f029a42102d90a5ca51c2d7d64095dbd846fbf6391582ac9e2f7a791e33b3dd ChangeLog-5.16.2
|
||||
|
|
@ -1571,6 +1578,10 @@ d5998c9a210d6d7c3c271baf4ab1299ecfe8546e8801c3b02b9f5e9fbaa98c20 linux-5.4.248.
|
|||
3abed132e76c6575733acba39eaa54f6d8f4b1dc951b0e601a33959743b13e35 linux-5.4.248.tar.xz
|
||||
ba2adb16e286956a3228a34ebd0c4116e57580b3fbf2ed10d98306c898975619 linux-5.4.249.tar.gz
|
||||
dc5458462c6edbe3473fc6dee80fbe0841df7c177fe0546c2f131e5918f5351d linux-5.4.249.tar.xz
|
||||
be57c44f232d0f4e55555daaee17c5f1b203d221d0a97ede4d8408ea456e28fa linux-5.4.250.tar.gz
|
||||
0f5b8876526062bf5e346f6b9dde88be873761ee33cf3b8a1586d7d109a091fb linux-5.4.250.tar.xz
|
||||
544793471e190bb377bb14415c88f40c94fed9979fcdc9636ad81a803d79ecf5 linux-5.4.251.tar.gz
|
||||
bcb4953ed68131ef17f9f1ba52cac8b9d70007f5ab600bf3dee1fbf8beb218ca linux-5.4.251.tar.xz
|
||||
b7feea0a1d505f26098d596e6ad6a2e8b476c8f63c52eabf435deab2bb9a5559 linux-5.5.tar.gz
|
||||
a6fbd4ee903c128367892c2393ee0d9657b6ed3ea90016d4dc6f1f6da20b2330 linux-5.5.tar.xz
|
||||
8ad23faa72b6a22e3701b90485c0a60c75bd4226c0a438d9cc15e6eb0da2a665 linux-5.5.1.tar.gz
|
||||
|
|
@ -2137,6 +2148,10 @@ da2e60edc84e2e89fe968f54303554cd78635ee991ebe5b931a7441a49707fb8 linux-5.10.183
|
|||
280662ec8dc8738cf947ad66e748141abd58cbe3b5ed66b7f2b153222b7c7090 linux-5.10.185.tar.xz
|
||||
2d82cb288c89469d39663555f2fff9666c7863786a3e097215039dd96bbdf76b linux-5.10.186.tar.gz
|
||||
1e60296a135d272bb7ce645f6ae68fbd4ffd1972cb4b82c38c6faa1172481be3 linux-5.10.186.tar.xz
|
||||
974341733772ed52e3a4fab2ac9fc1f49989fbd76089f17ad7914fc433325503 linux-5.10.187.tar.gz
|
||||
f69454210b3e9e00e8b8368aaa897d4ca59f8be3b85399a2fcaecbf17af98bbb linux-5.10.187.tar.xz
|
||||
f269f6f31885f81495903788198c6e69e7147d1569d688cc43d7dd0c00e63855 linux-5.10.188.tar.gz
|
||||
c9558bab35e23ae67661bfb3192c609c857f78582a035449ae63e33d04ab6112 linux-5.10.188.tar.xz
|
||||
8e7f07e91e9aa0611b749fd1a908dc9d28c7d612f831e9d273427d4442b55f25 linux-5.11.tar.gz
|
||||
04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4 linux-5.11.tar.xz
|
||||
13c77074922003f9c456dec532020067358849a54877d8bca68157b1a5feb5f7 linux-5.11.1.tar.gz
|
||||
|
|
@ -2549,6 +2564,12 @@ aefc85b0023a3db42950b988748b47ff5add31e65a7a3a868424dc0f7c8d59a8 linux-5.15.118
|
|||
7aa5a0fd3520947e5599e811d28acdc30e36446c016c7dcee3793e6d1cbecfcf linux-5.15.119.tar.xz
|
||||
bf73c722e2e3d42043e17fa978b569f7b45f0eae02cc58b431d45ea4157a808e linux-5.15.120.tar.gz
|
||||
6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6 linux-5.15.120.tar.xz
|
||||
46ada090598b0127219931c0d09938c4693d9ab5a3ff42041b5077d5e653439f linux-5.15.121.tar.gz
|
||||
07e0cebdb00d25459683e9c330a0576349b8c5e5f2abf053b864f9909151c31d linux-5.15.121.tar.xz
|
||||
094571ea8d63a3e195abd4904349d87e2cb07bf658af2d21dd4f203fb63ed6f7 linux-5.15.122.tar.gz
|
||||
38755801cd1ce229a8c0a0536d29aa37acea8a8aa13fa438e19fbf9d6293342d linux-5.15.122.tar.xz
|
||||
20ea4ec292839d74d199cd1381404f0389683f063de9ace48365eb398f24cdf0 linux-5.15.123.tar.gz
|
||||
2de69544a12e6a059163c58fc901c13bcf22e8cac39c66b56f8fbb633399bf93 linux-5.15.123.tar.xz
|
||||
d4791f2eddeb25c4e6ae0b2f9b3f5fb3fd394d7f9a57fa3e33de6dd9761480f6 linux-5.16.tar.gz
|
||||
027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz
|
||||
5c91875fd84393b6a8a6352f5f7a2fedbed3708e06dc8cc465a9f5a86d1324f5 linux-5.16.1.tar.gz
|
||||
|
|
@ -3036,6 +3057,8 @@ c1055b17cae94cefd31aac8da0cd4099f607c38765c8b1e590a760c0370ab7cc patch-5.4.244.
|
|||
5e627d9086f539e65c91f6e5c59c8bb66b59f9d369173dc0ccb14f70795d1876 patch-5.4.247.xz
|
||||
0d919e129bdd21bdd25f6f358b8da04a48b598de7baba067ce3e3489b5b4fadf patch-5.4.248.xz
|
||||
58f1a4f9bfb8b3df4227139074e57668938937dfe388df7e414891f1e2629abd patch-5.4.249.xz
|
||||
f3e6559d83083ae0b7a2cc432974774ce2eaeda22296935667168518aeae77c1 patch-5.4.250.xz
|
||||
2a9600af97c18eff47c808fdc46c70ee48032d16a9ae53d8cc93f6e12cb47069 patch-5.4.251.xz
|
||||
e082f16aa710285ada2c1376b5509bb3bd49548b60ffca84605ac632caa990db patch-5.5.xz
|
||||
db575e6dfabeb2ab409e2c56f826a6d52d56b8a3b0c004ae261cabd5af220688 patch-5.5.1.xz
|
||||
07cbd21a049b0bf5a96d7e0b8272db8e53e9947f0eff06fa2a765bb3b34bc8fa patch-5.5.2.xz
|
||||
|
|
@ -3319,6 +3342,8 @@ c04019da6ab852a66bad81382fd9ba1d3a30d1d1fd784f8a0ca4565516b36098 patch-5.10.181
|
|||
1bde9f3d8bace93e634ca0841fca14fcbd7b6d53cf877ee3e7f18778bf842455 patch-5.10.184.xz
|
||||
46a321e7422e7a20646524f7b3ac883143419096f7d1aa24d0597a9d9c7b2de7 patch-5.10.185.xz
|
||||
185ec6c3155653bb5929455cd69ba97415d3ed3b185aa68a93897bce30725b5d patch-5.10.186.xz
|
||||
82a1e71141b8664ae6a2795e06f765b8e3f151585eee5cb4eb8ea3f5fed5e8e4 patch-5.10.187.xz
|
||||
3edbe6cf637af107336f5bda9f2f7f681b94247b4453bc1e1009aaabc5e8013b patch-5.10.188.xz
|
||||
5b2710f30dd7b0c6f886a2042a76a4e640d3a690a57817d6ac3da49d5e1d96e9 patch-5.11.xz
|
||||
8808ee2c7e904f2fb3c830b41c8bbc2b2ad37638ee95fdfde68167f0be35dd3f patch-5.11.1.xz
|
||||
7a6d20308aed903a81a67e76e7c6cd294fb7cbb87f887e2168097da865def8ba patch-5.11.2.xz
|
||||
|
|
@ -3525,6 +3550,9 @@ c8c39191dc89ccb8f0fd05e4b06c9bcc77672156bdc64fe445d2109c116a3432 patch-5.15.117
|
|||
790fedbd68008b2461ed76b79a7a450a12712f984e67966ca113b32f4f9a475e patch-5.15.118.xz
|
||||
6d28487954b150859fb0af4a46336f9c2a8b6bfc73480c00d751db5a10571c2c patch-5.15.119.xz
|
||||
eba49da6370da30784508d2b17c3d36c87482805907028966d5a0a6e69d56569 patch-5.15.120.xz
|
||||
acdebb94e3b84d74d8ff851a5c622f0304b832d7b62e795c0b846adc65eb66a5 patch-5.15.121.xz
|
||||
3c010fcdcc1cf8468384d9468f57f47a0a8ffa8e99aabac91efade699b613dfb patch-5.15.122.xz
|
||||
6114dc1b29a584e05b024b480604af41ef69ab0ff1e4feecbd0b17ad961950e6 patch-5.15.123.xz
|
||||
cdc44e99ee873ef2fe27f1ca62120ad225e8d59a99506db3ebfd31e0c7f6796b patch-5.16.xz
|
||||
9ff97f3a01ec8744863ff611315c44c1f5d1ff551769f7d8359c85561dee1b1d patch-5.16.1.xz
|
||||
3a09c2f1ad410c09cf03921abeed1a6ca7c38138fb508171ee673d429d179171 patch-5.16.2.xz
|
||||
|
|
@ -3604,17 +3632,17 @@ fdabf20292982e808a26b87f2f29493ba9f20a87d958dc592018ba1a381669df patch-5.19.15.
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.22 (GNU/Linux)
|
||||
|
||||
iQIcBAEBCAAGBQJkpanTAAoJEGMtOgZYnaaxjsgP/Rn+XljjpiSWHESYrUhWr3h3
|
||||
RruvWguRTCekOq54wS/UFE/inZyq1NXVHU9IVMUaHAeu+HldiCrX7ia+3A4LxSc8
|
||||
EXX1NWXqgw2WFo7VoofobIhmblpkNafBSIfF72AcqwGskJ39ZMoEJhRyv4q91D6M
|
||||
B6hIMPTVEW1gxcRmCODYCxTu2RqpwdEWYel9aCCGFP/CeFcCbtrABhiRKAKWsduh
|
||||
LHWceplxvI5hGpw4I/PyWo7VYuCU2488t9cDne/q9Q7zlx9IaY9mPk5yiq4FIXq0
|
||||
9yTsMx6ra/V8JGJDrWhUN8BQFHYFqeWdOfMfrdrL4EJyRSg0OMrJ9BqXytmDuYGY
|
||||
k0rbOkI59tNkb5fAt7IR2rdJhz9IFUS/bu8ZVvf6jNReiMj6nS3yRoHhS3u/sv/m
|
||||
mEWRWXf0MG08XQ1Hyb51/GWoZT6xrgM6KQw08YguY0+5lPlwAA4yr08KCOPlxS8m
|
||||
dCyyeo19KBLwIOA6e5kJgG8pYRAj1Sp8aDZo1sp4e6eeQ2sC2nh9wszdnwo74I9n
|
||||
TuxiKmWxFzm+YxgXQIIqk+enJczOpCVoMQO1uOWKIgctJ+ohqq5zdI4yCh7nPcdb
|
||||
NlhOz6R0+62aym20qazFxaHl3EOW1YNoTZPFt7NJMvnOk7MNYUeqH9U9npdTJqOy
|
||||
pLnx7DatrGTbgva8AWR+
|
||||
=MnIj
|
||||
iQIcBAEBCAAGBQJkwhX9AAoJEGMtOgZYnaaxQTsQAJNY5SbB57wGpQvKQl8dNiXT
|
||||
10mTX7Tf5+Pm/p7J6iqb/Nr31mshLW3F7pVz5yBGEft6sEZLqpWBiiWix3yZZvBq
|
||||
sDsEwBz/+Jqzqn+yVrfxkKmsISNFlyU4DADnqLGf8YwiNEySXmfyc8y0Drq1CQqe
|
||||
vVnOX1VaiTz5PdKdq0mc+/vE6xB4U2i+NmDltXzirYAm0ByMQg3rSeHsKq//0Rkr
|
||||
C15urh3os9CA8oa7an62kKahVP2AdFfDLTtazsQmgLlh+ai5ZeYCLx/DTQHmNcfC
|
||||
fB4scyR8Xg64TfHztSJvNM5jQI3bIvEwe4jL9jzs1qPkSh8sEBLpM9Qq8hSJLcSX
|
||||
RjKOKPdadsIn89nmYfTHOaDJ015xPctOA2H+3WKYj42lwOorwY8JmhtWcrrnA2Nh
|
||||
Wt+afHu6FYYceOEsKs6S5IqNH6Bj19YMjoGtPIurPMHvOtB9EvNRL50Zd3PJLiX0
|
||||
S6a2yG//QbPXzmPTZHKJnjGd87jwIUZzVo0ozZ+iYFVbv7OimvOt6T/Bwao+KjWl
|
||||
BEZQmZqqhtAGUv36aEZdEe8t7/paosPYeDfqKSBDkxBzpO8FAGHp4hTmBIsqYvfj
|
||||
toy8CCIq0WXiOC/EhsaPJpFBg+pEVDDpKrTci7QUqC1OR5C1cq8AEFyjtMJ1hV6b
|
||||
UvK20EDr/uUm/m3KFdx7
|
||||
=6mHz
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 244m35.615s
|
||||
user 223m41.658s
|
||||
sys 20m2.573s
|
||||
real 253m8.380s
|
||||
user 230m5.886s
|
||||
sys 22m10.786s
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue