Cleanup patches/PatchList.txt
Now that we have a script to check the state of the tree, make it useful again.
This commit is contained in:
Laura Abbott
parent
14ee8bf7eb
commit
46396fbe53
104
PatchList.txt
104
PatchList.txt
@ -1,52 +1,78 @@
|
|||||||
**** Backports and patches headed/already upsteram *****************************
|
# This file contains patches that we intend to carry for longer than
|
||||||
|
# "Should show up in a stable release soonish"
|
||||||
|
# Some of these may eventually drop out
|
||||||
|
|
||||||
* cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch (rhbz 1000439)
|
kbuild-AFTER_LINK.patch
|
||||||
- Queued for next upstream release I believe. Fixes a segfault in cpupower
|
|
||||||
|
|
||||||
* dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch (rhbz 993744)
|
arm64-avoid-needing-console-to-enable-serial-console.patch
|
||||||
- Still pending upstream
|
|
||||||
|
|
||||||
* ath9k_rx_dma_stop_check.patch (rhbz 892811)
|
geekbox-v4-device-tree-support.patch
|
||||||
- Fixes some DMA issue on specific hardware. Taken from
|
|
||||||
https://dev.openwrt.org/browser/trunk/package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch?rev=34910
|
|
||||||
|
|
||||||
* secure-modules.patch
|
Initial-AllWinner-A64-and-PINE64-support.patch
|
||||||
* modsign-uefi.patch
|
|
||||||
* sb-hibernate.patch
|
|
||||||
* sysrq-secure-boot.patch
|
|
||||||
- Fedora secure boot support.
|
|
||||||
- Dear Matthew, this is your fault. Run sed already and get a new set out.
|
|
||||||
|
|
||||||
**** Other stuff that should go upstream (in decreasing likelyhood) ************
|
arm64-pcie-quirks-xgene.patch
|
||||||
|
|
||||||
* defaults-acpi-video.patch
|
usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
|
||||||
* disable-i8042-check-on-apple-mac.patch
|
|
||||||
* no-pcspkr-modalias.patch
|
|
||||||
* die-floppy-die.patch
|
|
||||||
Fedora policy decisions
|
|
||||||
Turn into CONFIG_ options and upstream ?
|
|
||||||
|
|
||||||
* input-kill-stupid-messages.patch
|
ARM-tegra-usb-no-reset.patch
|
||||||
* silence-fbcon-logo.patch
|
|
||||||
* silence-noise.patch
|
|
||||||
Fedora local 'hush' patches. (TODO: push more upstream)
|
|
||||||
|
|
||||||
* makefile-after_link.patch
|
bcm283x-upstream-fixes.patch
|
||||||
Rolandware that is used by the debuginfo generation.
|
|
||||||
Possibly upstreamable ?
|
|
||||||
|
|
||||||
* serial-460800.patch
|
lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
|
||||||
Probably not upstreamable.
|
|
||||||
http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
|
|
||||||
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
|
|
||||||
http://lkml.org/lkml/2006/8/2/208
|
|
||||||
|
|
||||||
********************************************************************************
|
input-kill-stupid-messages.patch
|
||||||
|
|
||||||
'MUSTARD' patches. Fedora local patches that are very unlikely to go upstream.
|
die-floppy-die.patch
|
||||||
|
|
||||||
* crash-driver.patch
|
no-pcspkr-modalias.patch
|
||||||
Unlikely to go upstream.
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=492803
|
silence-fbcon-logo.patch
|
||||||
|
|
||||||
|
Kbuild-Add-an-option-to-enable-GCC-VTA.patch
|
||||||
|
|
||||||
|
crash-driver.patch
|
||||||
|
|
||||||
|
#Secure boot patches
|
||||||
|
Add-secure_modules-call.patch
|
||||||
|
PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
|
||||||
|
x86-Lock-down-IO-port-access-when-module-security-is.patch
|
||||||
|
ACPI-Limit-access-to-custom_method.patch
|
||||||
|
asus-wmi-Restrict-debugfs-interface-when-module-load.patch
|
||||||
|
Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
|
||||||
|
acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
|
||||||
|
kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
|
||||||
|
x86-Restrict-MSR-access-when-module-loading-is-restr.patch
|
||||||
|
Add-option-to-automatically-enforce-module-signature.patch
|
||||||
|
efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
|
||||||
|
efi-Add-EFI_SECURE_BOOT-bit.patch
|
||||||
|
hibernate-Disable-in-a-signed-modules-environment.patch
|
||||||
|
Add-EFI-signature-data-types.patch
|
||||||
|
Add-an-EFI-signature-blob-parser-and-key-loader.patch
|
||||||
|
KEYS-Add-a-system-blacklist-keyring.patch
|
||||||
|
MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
|
||||||
|
MODSIGN-Support-not-importing-certs-from-db.patch
|
||||||
|
Add-sysrq-option-to-disable-secure-boot-mode.patch
|
||||||
|
kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
|
||||||
|
|
||||||
|
drm-i915-hush-check-crtc-state.patch
|
||||||
|
|
||||||
|
disable-i8042-check-on-apple-mac.patch
|
||||||
|
|
||||||
|
lis3-improve-handling-of-null-rate.patch
|
||||||
|
|
||||||
|
watchdog-Disable-watchdog-on-virtual-machines.patch
|
||||||
|
|
||||||
|
scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
|
||||||
|
|
||||||
|
criu-no-expert.patch
|
||||||
|
|
||||||
|
ath9k-rx-dma-stop-check.patch
|
||||||
|
|
||||||
|
xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
|
||||||
|
|
||||||
|
Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
|
||||||
|
|
||||||
|
firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
|
||||||
|
|
||||||
|
drm-i915-turn-off-wc-mmaps.patch
|
||||||
|
|
||||||
********************************************************************************
|
|
||||||
|
|||||||
@ -1,70 +0,0 @@
|
|||||||
From patchwork Fri Jul 8 15:37:35 2016
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
Subject: drm/amdgpu: Disable RPM helpers while reprobing connectors on resume
|
|
||||||
From: cpaul@redhat.com
|
|
||||||
X-Patchwork-Id: 97837
|
|
||||||
Message-Id: <1467992256-23832-1-git-send-email-cpaul@redhat.com>
|
|
||||||
To: amd-gfx@lists.freedesktop.org
|
|
||||||
Cc: Tom St Denis <tom.stdenis@amd.com>, Jammy Zhou <Jammy.Zhou@amd.com>,
|
|
||||||
open list <linux-kernel@vger.kernel.org>, stable@vger.kernel.org,
|
|
||||||
"open list:RADEON and AMDGPU DRM DRIVERS"
|
|
||||||
<dri-devel@lists.freedesktop.org>,
|
|
||||||
Alex Deucher <alexander.deucher@amd.com>, Lyude <cpaul@redhat.com>,
|
|
||||||
Flora Cui <Flora.Cui@amd.com>,
|
|
||||||
=?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>,
|
|
||||||
Monk Liu <Monk.Liu@amd.com>
|
|
||||||
Date: Fri, 8 Jul 2016 11:37:35 -0400
|
|
||||||
|
|
||||||
Just about all of amdgpu's connector probing functions try to acquire
|
|
||||||
runtime PM refs. If we try to do this in the context of
|
|
||||||
amdgpu_resume_kms by calling drm_helper_hpd_irq_event(), we end up
|
|
||||||
deadlocking the system.
|
|
||||||
|
|
||||||
Since we're guaranteed to be holding the spinlock for RPM in
|
|
||||||
amdgpu_resume_kms, and we already know the GPU is in working order, we
|
|
||||||
need to prevent the RPM helpers from trying to run during the initial
|
|
||||||
connector reprobe on resume.
|
|
||||||
|
|
||||||
There's a couple of solutions I've explored for fixing this, but this
|
|
||||||
one by far seems to be the simplest and most reliable (plus I'm pretty
|
|
||||||
sure that's what disable_depth is there for anyway).
|
|
||||||
|
|
||||||
Reproduction recipe:
|
|
||||||
- Get any laptop dual GPUs using PRIME
|
|
||||||
- Make sure runtime PM is enabled for amdgpu
|
|
||||||
- Boot the machine
|
|
||||||
- If the machine managed to boot without hanging, switch out of X to
|
|
||||||
another VT. This should definitely cause X to hang infinitely.
|
|
||||||
|
|
||||||
Cc: stable@vger.kernel.org
|
|
||||||
Signed-off-by: Lyude <cpaul@redhat.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++++++++++++
|
|
||||||
1 file changed, 12 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
|
||||||
index 6e92008..46c1fee 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
|
||||||
@@ -1841,7 +1841,19 @@ int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
|
|
||||||
}
|
|
||||||
|
|
||||||
drm_kms_helper_poll_enable(dev);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Most of the connector probing functions try to acquire runtime pm
|
|
||||||
+ * refs to ensure that the GPU is powered on when connector polling is
|
|
||||||
+ * performed. Since we're calling this from a runtime PM callback,
|
|
||||||
+ * trying to acquire rpm refs will cause us to deadlock.
|
|
||||||
+ *
|
|
||||||
+ * Since we're guaranteed to be holding the rpm lock, it's safe to
|
|
||||||
+ * temporarily disable the rpm helpers so this doesn't deadlock us.
|
|
||||||
+ */
|
|
||||||
+ dev->dev->power.disable_depth++;
|
|
||||||
drm_helper_hpd_irq_event(dev);
|
|
||||||
+ dev->dev->power.disable_depth--;
|
|
||||||
|
|
||||||
if (fbcon) {
|
|
||||||
amdgpu_fbdev_set_suspend(adev, 0);
|
|
||||||
Loading…
x
Reference in New Issue
Block a user