kernel-5.17.10-0

* Wed May 25 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.10-0] - fedora: Re-enable efifb and vesafb drivers (Javier Martinez Canillas) - drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2022-05-25 08:40:20 -05:00 · 2022-05-25 08:40:20 -05:00 · 0f21e0ccbc
parent 6e8311fd63
commit 0f21e0ccbc
16 changed files with 155 additions and 99 deletions
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,3 +1,6 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/205bec68a0ea67b6bff6fea9603b7b8aeacc9d46
+ 205bec68a0ea67b6bff6fea9603b7b8aeacc9d46 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/8a35d9b408eeb4798a147fb76eb3f10368133de8
 8a35d9b408eeb4798a147fb76eb3f10368133de8 efi: x86: Set the NX-compatibility flag in the PE header

--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -1692,6 +1692,7 @@ CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_CROS_EC_ANX7688=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1729,7 +1730,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 CONFIG_DRM_LONTIUM_LT9611=m
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MESON_DW_HDMI=m
@ -1840,7 +1840,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
 CONFIG_DRM_SUN4I_HDMI=m
@ -1874,6 +1874,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@ -2134,7 +2135,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -2160,13 +2161,13 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2655,7 +2656,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -7401,7 +7402,7 @@ CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_SYSTEM76_ACPI is not set
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -1684,6 +1684,7 @@ CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_CROS_EC_ANX7688=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1721,7 +1722,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 CONFIG_DRM_LONTIUM_LT9611=m
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MESON_DW_HDMI=m
@ -1832,7 +1832,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
 CONFIG_DRM_SUN4I_HDMI=m
@ -1866,6 +1866,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@ -2118,7 +2119,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -2144,13 +2145,13 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2639,7 +2640,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -7374,7 +7375,7 @@ CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_SYSTEM76_ACPI is not set
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -1691,6 +1691,7 @@ CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_CROS_EC_ANX7688=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1747,7 +1748,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@ -1860,7 +1860,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_STI=m
 CONFIG_DRM_STM_DSI=m
 CONFIG_DRM_STM=m
@ -1899,6 +1899,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@ -2169,7 +2170,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -2195,13 +2196,13 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2673,7 +2674,7 @@ CONFIG_HZ_1000=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -7570,7 +7571,7 @@ CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSTEM76_ACPI is not set
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -1684,6 +1684,7 @@ CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_CROS_EC_ANX7688=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1740,7 +1741,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@ -1853,7 +1853,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_STI=m
 CONFIG_DRM_STM_DSI=m
 CONFIG_DRM_STM=m
@ -1892,6 +1892,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@ -2154,7 +2155,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -2180,13 +2181,13 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2658,7 +2659,7 @@ CONFIG_HZ_1000=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -7544,7 +7545,7 @@ CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSTEM76_ACPI is not set
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -1660,6 +1660,7 @@ CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_CROS_EC_ANX7688=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1712,7 +1713,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@ -1817,7 +1817,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_STI=m
 CONFIG_DRM_STM_DSI=m
 CONFIG_DRM_STM=m
@ -1856,6 +1856,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@ -2123,7 +2124,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -2149,13 +2150,13 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2619,7 +2620,7 @@ CONFIG_HZ_1000=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -7338,7 +7339,7 @@ CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSTEM76_ACPI is not set
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -1653,6 +1653,7 @@ CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_CROS_EC_ANX7688=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1705,7 +1706,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@ -1810,7 +1810,7 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_STI=m
 CONFIG_DRM_STM_DSI=m
 CONFIG_DRM_STM=m
@ -1849,6 +1849,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@ -2108,7 +2109,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -2134,13 +2135,13 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_SM501 is not set
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2604,7 +2605,7 @@ CONFIG_HZ_1000=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -7312,7 +7313,7 @@ CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSTEM76_ACPI is not set
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@ -1319,6 +1319,7 @@ CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1345,7 +1346,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
@ -1439,7 +1439,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TIDSS=m
 # CONFIG_DRM_TI_SN65DSI83 is not set
@ -1460,6 +1460,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@ -1694,7 +1695,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -1726,7 +1727,7 @@ CONFIG_FB_OF=y
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2168,7 +2169,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -6304,7 +6305,7 @@ CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSTEM76_ACPI is not set
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@ -1310,6 +1310,7 @@ CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1336,7 +1337,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
@ -1430,7 +1430,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TIDSS=m
 # CONFIG_DRM_TI_SN65DSI83 is not set
@ -1451,6 +1451,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@ -1677,7 +1678,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -1709,7 +1710,7 @@ CONFIG_FB_OF=y
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2151,7 +2152,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -6277,7 +6278,7 @@ CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSTEM76_ACPI is not set
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -1327,6 +1327,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 # CONFIG_DRM_CIRRUS_QEMU is not set
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1353,7 +1354,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_MXSFB is not set
@ -1447,7 +1447,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TIDSS=m
 # CONFIG_DRM_TI_SN65DSI83 is not set
@ -1468,6 +1468,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@ -1702,7 +1703,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -1733,7 +1734,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2151,7 +2152,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_ALGOPCA is not set
 # CONFIG_I2C_ALGOPCF is not set
 # CONFIG_I2C_ALI1535 is not set
@ -6246,7 +6247,7 @@ CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSTEM76_ACPI is not set
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -1318,6 +1318,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 # CONFIG_DRM_CIRRUS_QEMU is not set
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1344,7 +1345,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_MXSFB is not set
@ -1438,7 +1438,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TIDSS=m
 # CONFIG_DRM_TI_SN65DSI83 is not set
@ -1459,6 +1459,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@ -1685,7 +1686,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_EFI=y
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
@ -1716,7 +1717,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -2134,7 +2135,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_ALGOPCA is not set
 # CONFIG_I2C_ALGOPCF is not set
 # CONFIG_I2C_ALI1535 is not set
@ -6219,7 +6220,7 @@ CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSTEM76_ACPI is not set
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -1434,6 +1434,7 @@ CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_CROS_EC_ANX7688=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1469,7 +1470,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
@ -1563,7 +1563,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TIDSS=m
 # CONFIG_DRM_TI_SN65DSI83 is not set
@ -1584,6 +1584,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_MKSSTATS=y
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@ -1862,7 +1863,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
-CONFIG_FB_I810=m
+# CONFIG_FB_I810 is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
@ -1892,7 +1893,7 @@ CONFIG_FB_I810=m
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -1900,7 +1901,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
+# CONFIG_FB_VGA16 is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_VOODOO1 is not set
@ -2346,7 +2347,7 @@ CONFIG_HZ_1000=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -6685,7 +6686,7 @@ CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -1425,6 +1425,7 @@ CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_CHRONTEL_CH7033=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_CROS_EC_ANX7688=m
+# CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
@ -1460,7 +1461,6 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
-CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
@ -1554,7 +1554,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TIDSS=m
 # CONFIG_DRM_TI_SN65DSI83 is not set
@ -1575,6 +1575,7 @@ CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_MKSSTATS=y
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@ -1845,7 +1846,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_HYPERV is not set
 # CONFIG_FB_I740 is not set
-CONFIG_FB_I810=m
+# CONFIG_FB_I810 is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_KYRO is not set
@ -1875,7 +1876,7 @@ CONFIG_FB_I810=m
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_SSD1307=m
+# CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TMIO is not set
@ -1883,7 +1884,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
+# CONFIG_FB_VGA16 is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_VOODOO1 is not set
@ -2329,7 +2330,7 @@ CONFIG_HZ_1000=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@ -6659,7 +6660,7 @@ CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
--- a/kernel.spec
+++ b/kernel.spec
@ -130,7 +130,7 @@ Summary: The Linux kernel
 # The kernel tarball/base version
 %define kversion 5.17

-%define rpmversion 5.17.9
+%define rpmversion 5.17.10
 %define patchversion 5.17
 %define pkgrelease 200

@ -695,7 +695,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17.9.tar.xz
+Source0: linux-5.17.10.tar.xz

 Source1: Makefile.rhelver

@ -1387,8 +1387,8 @@ ApplyOptionalPatch()
  fi
 }

-%setup -q -n kernel-5.17.9 -c
-mv linux-5.17.9 linux-%{KVERREL}
+%setup -q -n kernel-5.17.10 -c
+mv linux-5.17.10 linux-%{KVERREL}

 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@ -3015,6 +3015,10 @@ fi
 #
 #
 %changelog
+* Wed May 25 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.10-0]
+- fedora: Re-enable efifb and vesafb drivers (Javier Martinez Canillas)
+- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas)
+
 * Wed May 18 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.9-0]
 - Fix changelog for 5.17.8 (Justin M. Forbes)

--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@ -24,6 +24,7 @@
 drivers/firmware/efi/libstub/efistub.h             |  74 ++++++++++++
 drivers/firmware/efi/libstub/x86-stub.c            | 119 +++++++++++++++++++-
 drivers/firmware/efi/secureboot.c                  |  38 +++++++
+ drivers/firmware/sysfb.c                           |  18 ++-
 drivers/gpu/drm/i915/display/intel_bios.c          |   6 +
 drivers/gpu/drm/i915/display/intel_psr.c           |   9 ++
 drivers/gpu/drm/i915/display/intel_vbt_defs.h      |   3 +
@ -59,7 +60,7 @@
 security/lockdown/Kconfig                          |  13 +++
 security/lockdown/lockdown.c                       |   1 +
 security/security.c                                |   6 +
- 61 files changed, 980 insertions(+), 212 deletions(-)
+ 62 files changed, 997 insertions(+), 213 deletions(-)

 diff --git a/Documentation/core-api/dma-attributes.rst b/Documentation/core-api/dma-attributes.rst
 index 1887d92e8e92..17706dc91ec9 100644
@ -111,7 +112,7 @@ index 000000000000..733a26bd887a
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index aba139bbd1c7..01a8c0b291ac 100644
+index 318597a4147e..739e5da2072e 100644
 --- a/Makefile
 +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -1249,6 +1250,42 @@ index 000000000000..de0a3714a5d4
 +		}
 +	}
 +}
+diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c
+index 2bfbb05f7d89..a504f7234f35 100644
+--- a/drivers/firmware/sysfb.c
+++ b/drivers/firmware/sysfb.c
+@@ -34,6 +34,22 @@
+ #include <linux/screen_info.h>
+ #include <linux/sysfb.h>
+
+static int skip_simpledrm;
+
+static int __init simpledrm_disable(char *opt)
+{
+	if (!opt)
+                return -EINVAL;
+
+	get_option(&opt, &skip_simpledrm);
+
+	if (skip_simpledrm)
+		pr_info("The simpledrm driver will not be probed\n");
+
+	return 0;
+}
+early_param("nvidia-drm.modeset", simpledrm_disable);
+
+ static __init int sysfb_init(void)
+ {
+ 	struct screen_info *si = &screen_info;
+@@ -45,7 +61,7 @@ static __init int sysfb_init(void)
+
+ 	/* try to create a simple-framebuffer device */
+ 	compatible = sysfb_parse_mode(si, &mode);
+-	if (compatible) {
+	if (compatible && !skip_simpledrm) {
+ 		ret = sysfb_create_simplefb(si, &mode);
+ 		if (!ret)
+ 			return 0;
 diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
 index 9d989c9f5da4..5d97a251d3dc 100644
 --- a/drivers/gpu/drm/i915/display/intel_bios.c
@ -1684,7 +1721,7 @@ index 107dcf5938d6..225a9797e39d 100644
  * Changes the default domain of an iommu group that has *only* one device
  *
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 10f7c79caac2..8ac0161d2aef 100644
+index 0abd772c57f0..3c9889ce56ac 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
@@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@ -1751,7 +1788,7 @@ index 10f7c79caac2..8ac0161d2aef 100644
 }
 EXPORT_SYMBOL_GPL(nvme_complete_rq);
 diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index a703f1f5fb64..d77c24333cb4 100644
+index 189175fff7e4..c0627a9d1274 100644
 --- a/drivers/nvme/host/multipath.c
 +++ b/drivers/nvme/host/multipath.c
@@ -101,14 +101,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
@ -1787,7 +1824,7 @@ index a703f1f5fb64..d77c24333cb4 100644

 	spin_lock_irqsave(&ns->head->requeue_lock, flags);
 	for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -870,8 +876,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+@@ -891,8 +897,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
 	int error = 0;

 	/* check if multipath is enabled and we have the capability */
@ -1798,7 +1835,7 @@ index a703f1f5fb64..d77c24333cb4 100644

 	if (!ctrl->max_namespaces ||
 diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index 68c42e831117..6a7091335257 100644
+index 85f3f55c71c5..aad43c21c0a4 100644
 --- a/drivers/nvme/host/nvme.h
 +++ b/drivers/nvme/host/nvme.h
@@ -794,6 +794,7 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys);
@ -1809,7 +1846,7 @@ index 68c42e831117..6a7091335257 100644
 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);
 int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);
 void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id);
-@@ -832,6 +833,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name,
+@@ -833,6 +834,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name,
 static inline void nvme_failover_req(struct request *req)
 {
 }
@ -2144,10 +2181,10 @@ index ab7eea01ab42..fff7c5f737fc 100644

 int rmi_register_transport_device(struct rmi_transport_dev *xport);
 diff --git a/include/linux/security.h b/include/linux/security.h
-index 25b3ef71f495..d37a6c88c69f 100644
+index 7fc4e9f49f54..6f0b0b2dc73d 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -471,6 +471,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
+@@ -473,6 +473,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
 int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
 int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);
 int security_locked_down(enum lockdown_reason what);
@ -2155,7 +2192,7 @@ index 25b3ef71f495..d37a6c88c69f 100644
 #else /* CONFIG_SECURITY */

 static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)
-@@ -1347,6 +1348,10 @@ static inline int security_locked_down(enum lockdown_reason what)
+@@ -1349,6 +1350,10 @@ static inline int security_locked_down(enum lockdown_reason what)
 {
 	return 0;
 }
@ -2365,10 +2402,10 @@ index 87cbdc64d272..18555cf18da7 100644

 static int __init lockdown_lsm_init(void)
 diff --git a/security/security.c b/security/security.c
-index b7cf5cbfdc67..3cde9062fcf6 100644
+index aaf6566deb9f..86926966c15d 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -2623,6 +2623,12 @@ int security_locked_down(enum lockdown_reason what)
+@@ -2625,6 +2625,12 @@ int security_locked_down(enum lockdown_reason what)
 }
 EXPORT_SYMBOL(security_locked_down);

--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.17.9.tar.xz) = b78f45f3001d63801353145ad54525848ad12cbdfaa460d51dc2a8ff0ac3172281aed4b78a876b862e5ccf323a6d51d7d3dfe03e54b13e526fbc8972e9e1c175
-SHA512 (kernel-abi-stablelists-5.17.9-200.tar.bz2) = fb285216ea69b210d7d7f7668f45a46cec55d5d37f94d5ca839d5088dfe30f36f83002ec2b2cf0274d40b0eb578852f677ca149e972c0f783856940e0b97c407
-SHA512 (kernel-kabi-dw-5.17.9-200.tar.bz2) = a479834338f3a72e0b7c66cc7c7ed93a291f66daa947969bb5263c5ffacc3896e9ef9d6c7febe2303b3b3a01edc374d9f04cf417b4afbbc5ed7d00c849a5cbff
+SHA512 (linux-5.17.10.tar.xz) = 547b10b4d5765e11da4da7bb9e582b964bf42154b32571f892a9565c3e0d6b5e0b5600fc69edd8da8e1058ddc8fa7e142a8c27392762b6096373116a06c1085e
+SHA512 (kernel-abi-stablelists-5.17.10-200.tar.bz2) = 4417a321518ca22a272bdad39fe306246693971d0190e4fbaa141535e07b7bf5afae492c110d241998c261f8de210f89693ae8276c3e11d8c0b32ce40ab08a59
+SHA512 (kernel-kabi-dw-5.17.10-200.tar.bz2) = 26524ec79ebbbdbc3674b0fe48a34374970567db0df78c559049a5082c12c2bb156e5737ab2472d70c78591211844b2863aaded929f9298a5fa217963cfa3763