kernel-5.19.0-0.rc5.20220706gite35e5b6f695d.42
* Wed Jul 06 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc5.e35e5b6f695d.41] - drm/aperture: Run fbdev removal before internal helpers (Thomas Zimmermann) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes
parent
1752ad2319
commit
4342b9c4c2
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 40
|
||||
RHEL_RELEASE = 42
|
||||
|
||||
#
|
||||
# ZSTREAM
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
"https://gitlab.com/cki-project/kernel-ark/-/commit"/8de3bef2cbd61732031e9e0c270566b103306114
|
||||
8de3bef2cbd61732031e9e0c270566b103306114 drm/aperture: Run fbdev removal before internal helpers
|
||||
|
||||
"https://gitlab.com/cki-project/kernel-ark/-/commit"/297bcb88233101e8d5062729ff3a5f989bad1c3b
|
||||
297bcb88233101e8d5062729ff3a5f989bad1c3b Revert "crypto: rng - Override drivers/char/random in FIPS mode"
|
||||
|
||||
|
||||
@ -124,13 +124,13 @@ Summary: The Linux kernel
|
||||
# define buildid .local
|
||||
%define specversion 5.19.0
|
||||
%define patchversion 5.19
|
||||
%define pkgrelease 0.rc5.20220705gitc1084b6c5620.40
|
||||
%define pkgrelease 0.rc5.20220706gite35e5b6f695d.42
|
||||
%define kversion 5
|
||||
%define tarfile_release 5.19-rc5-49-gc1084b6c5620
|
||||
%define tarfile_release 5.19-rc5-56-ge35e5b6f695d
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 19
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc5.20220705gitc1084b6c5620.40%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc5.20220706gite35e5b6f695d.42%{?buildid}%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 5.19.0
|
||||
|
||||
@ -3100,6 +3100,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed Jul 06 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc5.e35e5b6f695d.41]
|
||||
- drm/aperture: Run fbdev removal before internal helpers (Thomas Zimmermann)
|
||||
|
||||
* Sat Jul 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc4.089866061428.36]
|
||||
- fedora: arm: enable a couple of QCom drivers (Peter Robinson)
|
||||
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
drivers/firmware/efi/Makefile | 1 +
|
||||
drivers/firmware/efi/efi.c | 124 +++--
|
||||
drivers/firmware/efi/secureboot.c | 38 ++
|
||||
drivers/gpu/drm/drm_aperture.c | 26 +-
|
||||
drivers/hid/hid-rmi.c | 64 ---
|
||||
drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +
|
||||
drivers/input/rmi4/rmi_driver.c | 124 +++--
|
||||
@ -64,7 +65,7 @@
|
||||
security/lockdown/Kconfig | 13 +
|
||||
security/lockdown/lockdown.c | 1 +
|
||||
security/security.c | 6 +
|
||||
66 files changed, 1544 insertions(+), 187 deletions(-)
|
||||
67 files changed, 1559 insertions(+), 198 deletions(-)
|
||||
|
||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
||||
index 2522b11e593f..852307b46301 100644
|
||||
@ -748,6 +749,49 @@ index 000000000000..de0a3714a5d4
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
diff --git a/drivers/gpu/drm/drm_aperture.c b/drivers/gpu/drm/drm_aperture.c
|
||||
index 74bd4a76b253..059fd71424f6 100644
|
||||
--- a/drivers/gpu/drm/drm_aperture.c
|
||||
+++ b/drivers/gpu/drm/drm_aperture.c
|
||||
@@ -329,7 +329,20 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
|
||||
const struct drm_driver *req_driver)
|
||||
{
|
||||
resource_size_t base, size;
|
||||
- int bar, ret = 0;
|
||||
+ int bar, ret;
|
||||
+
|
||||
+ /*
|
||||
+ * WARNING: Apparently we must kick fbdev drivers before vgacon,
|
||||
+ * otherwise the vga fbdev driver falls over.
|
||||
+ */
|
||||
+#if IS_REACHABLE(CONFIG_FB)
|
||||
+ ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+#endif
|
||||
+ ret = vga_remove_vgacon(pdev);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
|
||||
for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) {
|
||||
if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
|
||||
@@ -339,15 +352,6 @@ int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,
|
||||
drm_aperture_detach_drivers(base, size);
|
||||
}
|
||||
|
||||
- /*
|
||||
- * WARNING: Apparently we must kick fbdev drivers before vgacon,
|
||||
- * otherwise the vga fbdev driver falls over.
|
||||
- */
|
||||
-#if IS_REACHABLE(CONFIG_FB)
|
||||
- ret = remove_conflicting_pci_framebuffers(pdev, req_driver->name);
|
||||
-#endif
|
||||
- if (ret == 0)
|
||||
- ret = vga_remove_vgacon(pdev);
|
||||
- return ret;
|
||||
+ return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(drm_aperture_remove_conflicting_pci_framebuffers);
|
||||
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
|
||||
index 311eee599ce9..2460c6bd46f8 100644
|
||||
--- a/drivers/hid/hid-rmi.c
|
||||
|
||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-5.19-rc5-49-gc1084b6c5620.tar.xz) = 2d6cb83c18af527b361077105e6a99b00b139f7da7827077a6701639d868d840a9d2b457e4931f18a23893f867f629963b2d72f96f298ac069dcb77a7f66a2c1
|
||||
SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = c030419b617897da97d433e4f487f86b64698996e9076b563b099c073c5ba78ee75f61fa820b38c17cdb6fffb05b7d656b144716729f6afa4f2fb0f2154ac476
|
||||
SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = b1b7d29dc596879de58b78131dc1c070e66f00ac0140c57bac73bc7785234f1118df001e62645adb671f3751c0e371a8e283a6dbab05c78ecd58090dde377029
|
||||
SHA512 (linux-5.19-rc5-56-ge35e5b6f695d.tar.xz) = 136cbff329f93a12c968147b9af5e152de629a71c6458d058c1bbed7fb67bacc32d1535e0576d0aa48034a08ff2bfcc881e3a3cbe9adb723b07b4cfeb3211d09
|
||||
SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = 9b36b589fafaf6797d2342b46ea321a33efb38d6ecbffaf25d606fc742560aaa831d1ab4b2d825cb937cc1d52cc90e7616363fc927a0a431d7e32c4cf6e3846b
|
||||
SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = c9ffe628c5260ad6373ad6542641d8df40206ca80c71cf26ce618d413f2c7b57f1e179fb18c9b93383b9c77044ed6cf797257fabb9fc11fa4bc20fffb4d9613c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user