From 8be64d15329a945ef1b3f218d5532ecf92cf2245 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 27 Jan 2022 07:42:55 -0600 Subject: kernel-5.16.3-200 * Thu Jan 27 2022 Justin M. Forbes [5.16.3-200] - Fix up changelog (Justin M. Forbes) - Add file forgotten in simpledrm revert (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 + kernel-aarch64-debug-fedora.config | 15 +- kernel-aarch64-fedora.config | 15 +- kernel-armv7hl-debug-fedora.config | 15 +- kernel-armv7hl-fedora.config | 15 +- kernel-armv7hl-lpae-debug-fedora.config | 15 +- kernel-armv7hl-lpae-fedora.config | 15 +- kernel-i686-debug-fedora.config | 24 ++- kernel-i686-fedora.config | 24 ++- kernel-ppc64le-debug-fedora.config | 15 +- kernel-ppc64le-fedora.config | 15 +- kernel-s390x-debug-fedora.config | 15 +- kernel-s390x-fedora.config | 15 +- kernel-x86_64-debug-fedora.config | 19 +- kernel-x86_64-fedora.config | 19 +- kernel.spec | 15 +- patch-5.16-redhat.patch | 368 ++++++++++++++++++++++++++++---- sources | 6 +- 18 files changed, 458 insertions(+), 170 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 996b43ca8..066669310 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/caf0c7ca6fe0e84e0ca85aa89a5c881ba46b5fb2 + caf0c7ca6fe0e84e0ca85aa89a5c881ba46b5fb2 drm/i915: Flush TLBs before releasing backing store + https://gitlab.com/cki-project/kernel-ark/-/commit/933f8e20d77088ff01589f9a625a1f8e69681c1b 933f8e20d77088ff01589f9a625a1f8e69681c1b Revert "[scsi] megaraid_sas: re-add certain pci-ids" diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 590a62c90..ab7ebb1d5 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1673,7 +1673,6 @@ 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 @@ -1711,6 +1710,7 @@ 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 @@ -1815,7 +1815,7 @@ CONFIG_DRM_ROCKCHIP=m CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set CONFIG_DRM_SIMPLE_BRIDGE=m -CONFIG_DRM_SIMPLEDRM=y +# CONFIG_DRM_SIMPLEDRM is not set CONFIG_DRM_SUN4I_BACKEND=m CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m @@ -1849,7 +1849,6 @@ 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 +2107,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -2134,13 +2133,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 is not set +CONFIG_FB_SIMPLE=y # 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 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2621,7 +2620,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -7314,7 +7313,7 @@ CONFIG_SYNTH_EVENTS=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYSTEM76_ACPI is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index c8ac7e814..5949fad8c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1665,7 +1665,6 @@ 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 @@ -1703,6 +1702,7 @@ 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 @@ -1807,7 +1807,7 @@ CONFIG_DRM_ROCKCHIP=m CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set CONFIG_DRM_SIMPLE_BRIDGE=m -CONFIG_DRM_SIMPLEDRM=y +# CONFIG_DRM_SIMPLEDRM is not set CONFIG_DRM_SUN4I_BACKEND=m CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m @@ -1841,7 +1841,6 @@ 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 @@ -2092,7 +2091,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -2118,13 +2117,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 is not set +CONFIG_FB_SIMPLE=y # 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 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2605,7 +2604,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -7288,7 +7287,7 @@ CONFIG_SYNTH_EVENTS=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYSTEM76_ACPI is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 01c106b90..958c10d85 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1677,7 +1677,6 @@ 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 @@ -1734,6 +1733,7 @@ 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 @@ -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=y +# CONFIG_DRM_SIMPLEDRM is not set CONFIG_DRM_STI=m CONFIG_DRM_STM_DSI=m CONFIG_DRM_STM=m @@ -1879,7 +1879,6 @@ 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 @@ -2148,7 +2147,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -2174,13 +2173,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 is not set +CONFIG_FB_SIMPLE=y # 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 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2644,7 +2643,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -7509,7 +7508,7 @@ CONFIG_SYNTH_EVENTS=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index af5bf661b..50ec9cccd 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1670,7 +1670,6 @@ 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 @@ -1727,6 +1726,7 @@ 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 @@ -1833,7 +1833,7 @@ CONFIG_DRM_ROCKCHIP=m CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set CONFIG_DRM_SIMPLE_BRIDGE=m -CONFIG_DRM_SIMPLEDRM=y +# CONFIG_DRM_SIMPLEDRM is not set CONFIG_DRM_STI=m CONFIG_DRM_STM_DSI=m CONFIG_DRM_STM=m @@ -1872,7 +1872,6 @@ 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 @@ -2133,7 +2132,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -2159,13 +2158,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 is not set +CONFIG_FB_SIMPLE=y # 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 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2629,7 +2628,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -7484,7 +7483,7 @@ CONFIG_SYNTH_EVENTS=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 861bd0e90..25187135f 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1646,7 +1646,6 @@ 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 @@ -1699,6 +1698,7 @@ 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 @@ -1797,7 +1797,7 @@ CONFIG_DRM_ROCKCHIP=m CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set CONFIG_DRM_SIMPLE_BRIDGE=m -CONFIG_DRM_SIMPLEDRM=y +# CONFIG_DRM_SIMPLEDRM is not set CONFIG_DRM_STI=m CONFIG_DRM_STM_DSI=m CONFIG_DRM_STM=m @@ -1836,7 +1836,6 @@ 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 @@ -2102,7 +2101,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -2128,13 +2127,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 is not set +CONFIG_FB_SIMPLE=y # 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 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2590,7 +2589,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -7277,7 +7276,7 @@ CONFIG_SYNTH_EVENTS=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 612da9b7c..2303044c2 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1639,7 +1639,6 @@ 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 @@ -1692,6 +1691,7 @@ 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 @@ -1790,7 +1790,7 @@ CONFIG_DRM_ROCKCHIP=m CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set CONFIG_DRM_SIMPLE_BRIDGE=m -CONFIG_DRM_SIMPLEDRM=y +# CONFIG_DRM_SIMPLEDRM is not set CONFIG_DRM_STI=m CONFIG_DRM_STM_DSI=m CONFIG_DRM_STM=m @@ -1829,7 +1829,6 @@ 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 @@ -2087,7 +2086,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -2113,13 +2112,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 is not set +CONFIG_FB_SIMPLE=y # 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 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2575,7 +2574,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -7252,7 +7251,7 @@ CONFIG_SYNTH_EVENTS=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 666ceab4d..2077b03e6 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1375,7 +1375,6 @@ 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 @@ -1411,6 +1410,7 @@ 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 @@ -1498,7 +1498,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=y +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TIDSS=m # CONFIG_DRM_TI_SN65DSI83 is not set @@ -1519,7 +1519,6 @@ 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 @@ -1788,13 +1787,18 @@ 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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set +# CONFIG_FB_GEODE_GX1 is not set +CONFIG_FB_GEODE_GX=y +CONFIG_FB_GEODE_LX=y +CONFIG_FB_GEODE=y # CONFIG_FB_HGA is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set -# CONFIG_FB_I810 is not set +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set @@ -1825,7 +1829,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SM712 is not set # CONFIG_FB_SM750 is not set # CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_SSD1307 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -1833,7 +1837,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -# CONFIG_FB_VGA16 is not set +CONFIG_FB_VGA16=m # CONFIG_FB_VIA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set @@ -2277,7 +2281,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m CONFIG_I2C_ALI1535=m @@ -6552,7 +6556,7 @@ CONFIG_SYNTH_EVENTS=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set CONFIG_SYSTEM76_ACPI=m CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 62377b3c7..a2d8d83fe 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -1366,7 +1366,6 @@ 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 @@ -1402,6 +1401,7 @@ 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 @@ -1489,7 +1489,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=y +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TIDSS=m # CONFIG_DRM_TI_SN65DSI83 is not set @@ -1510,7 +1510,6 @@ 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 @@ -1771,13 +1770,18 @@ 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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set +# CONFIG_FB_GEODE_GX1 is not set +CONFIG_FB_GEODE_GX=y +CONFIG_FB_GEODE_LX=y +CONFIG_FB_GEODE=y # CONFIG_FB_HGA is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set -# CONFIG_FB_I810 is not set +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set @@ -1808,7 +1812,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_SM712 is not set # CONFIG_FB_SM750 is not set # CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_SSD1307 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -1816,7 +1820,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -# CONFIG_FB_VGA16 is not set +CONFIG_FB_VGA16=m # CONFIG_FB_VIA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set @@ -2260,7 +2264,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m CONFIG_I2C_ALI1535=m @@ -6527,7 +6531,7 @@ CONFIG_SYNTH_EVENTS=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set CONFIG_SYSTEM76_ACPI=m CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 417d620a4..4e7bb78ee 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1306,7 +1306,6 @@ 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 @@ -1333,6 +1332,7 @@ 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 @@ -1420,7 +1420,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=y +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TIDSS=m # CONFIG_DRM_TI_SN65DSI83 is not set @@ -1441,7 +1441,6 @@ 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 @@ -1675,7 +1674,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -1707,7 +1706,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 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2141,7 +2140,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -2176,6 +2175,7 @@ CONFIG_I2C_HID_ACPI=m # CONFIG_I2C_HISI is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set +CONFIG_I2C=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m CONFIG_I2C_MPC=m @@ -2215,7 +2215,6 @@ CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIPERBOARD=m CONFIG_I2C_VIRTIO=m # CONFIG_I2C_XILINX is not set -CONFIG_I2C=y # CONFIG_I3C is not set # CONFIG_I40E_DCB is not set CONFIG_I40E=m @@ -6244,7 +6243,7 @@ CONFIG_SYNTH_EVENTS=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f264e456e..2823c7cf3 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1297,7 +1297,6 @@ 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 @@ -1324,6 +1323,7 @@ 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 @@ -1411,7 +1411,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=y +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TIDSS=m # CONFIG_DRM_TI_SN65DSI83 is not set @@ -1432,7 +1432,6 @@ 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 @@ -1658,7 +1657,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -1690,7 +1689,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 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2124,7 +2123,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -2159,6 +2158,7 @@ CONFIG_I2C_HID_ACPI=m # CONFIG_I2C_HISI is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set +CONFIG_I2C=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m CONFIG_I2C_MPC=m @@ -2198,7 +2198,6 @@ CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIPERBOARD=m CONFIG_I2C_VIRTIO=m # CONFIG_I2C_XILINX is not set -CONFIG_I2C=y # CONFIG_I3C is not set # CONFIG_I40E_DCB is not set CONFIG_I40E=m @@ -6218,7 +6217,7 @@ CONFIG_SYNTH_EVENTS=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index cc96525b8..a13ec207e 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1313,7 +1313,6 @@ 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 @@ -1340,6 +1339,7 @@ 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 @@ -1427,7 +1427,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=y +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TIDSS=m # CONFIG_DRM_TI_SN65DSI83 is not set @@ -1448,7 +1448,6 @@ 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 @@ -1682,7 +1681,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -1713,7 +1712,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_SM712 is not set # CONFIG_FB_SM750 is not set # CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_SSD1307 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2123,7 +2122,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=y +CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_ALGOPCA is not set # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALI1535 is not set @@ -2158,6 +2157,7 @@ CONFIG_I2C_HID_ACPI=m # CONFIG_I2C_HISI is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set +CONFIG_I2C=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m # CONFIG_I2C_MUX_GPIO is not set @@ -2196,7 +2196,6 @@ CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIPERBOARD=m CONFIG_I2C_VIRTIO=m # CONFIG_I2C_XILINX is not set -CONFIG_I2C=y # CONFIG_I3C is not set # CONFIG_I40E_DCB is not set CONFIG_I40E=m @@ -6185,7 +6184,7 @@ CONFIG_SYNTH_EVENTS=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 0e72beec5..a02e0dd37 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1304,7 +1304,6 @@ 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 @@ -1331,6 +1330,7 @@ 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 @@ -1418,7 +1418,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=y +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TIDSS=m # CONFIG_DRM_TI_SN65DSI83 is not set @@ -1439,7 +1439,6 @@ 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 @@ -1665,7 +1664,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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set @@ -1696,7 +1695,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_SM712 is not set # CONFIG_FB_SM750 is not set # CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_SSD1307 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -2106,7 +2105,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=y +CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_ALGOPCA is not set # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALI1535 is not set @@ -2141,6 +2140,7 @@ CONFIG_I2C_HID_ACPI=m # CONFIG_I2C_HISI is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set +CONFIG_I2C=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m # CONFIG_I2C_MUX_GPIO is not set @@ -2179,7 +2179,6 @@ CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIPERBOARD=m CONFIG_I2C_VIRTIO=m # CONFIG_I2C_XILINX is not set -CONFIG_I2C=y # CONFIG_I3C is not set # CONFIG_I40E_DCB is not set CONFIG_I40E=m @@ -6159,7 +6158,7 @@ CONFIG_SYNTH_EVENTS=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 58386ca59..3400b5693 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1414,7 +1414,6 @@ 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 @@ -1450,6 +1449,7 @@ 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 @@ -1537,7 +1537,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=y +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TIDSS=m # CONFIG_DRM_TI_SN65DSI83 is not set @@ -1558,7 +1558,6 @@ 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 @@ -1830,13 +1829,15 @@ 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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set -# CONFIG_FB_I810 is not set +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set @@ -1866,7 +1867,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_SM712 is not set # CONFIG_FB_SM750 is not set # CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_SSD1307 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -1874,7 +1875,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -# CONFIG_FB_VGA16 is not set +CONFIG_FB_VGA16=m # CONFIG_FB_VIA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set @@ -2312,7 +2313,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -6606,7 +6607,7 @@ CONFIG_SYNTH_EVENTS=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set CONFIG_SYSTEM76_ACPI=m CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 183ed550a..3ccd34fd1 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1405,7 +1405,6 @@ 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 @@ -1441,6 +1440,7 @@ 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 @@ -1528,7 +1528,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=y +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TIDSS=m # CONFIG_DRM_TI_SN65DSI83 is not set @@ -1549,7 +1549,6 @@ 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 @@ -1813,13 +1812,15 @@ 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 is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set -# CONFIG_FB_I810 is not set +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set @@ -1849,7 +1850,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_SM712 is not set # CONFIG_FB_SM750 is not set # CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_SSD1307 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TMIO is not set @@ -1857,7 +1858,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -# CONFIG_FB_VGA16 is not set +CONFIG_FB_VGA16=m # CONFIG_FB_VIA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set @@ -2295,7 +2296,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=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_ALI1535 is not set @@ -6581,7 +6582,7 @@ CONFIG_SYNTH_EVENTS=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set CONFIG_SYSTEM76_ACPI=m CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" diff --git a/kernel.spec b/kernel.spec index 1b88d927a..6545ef131 100755 --- a/kernel.spec +++ b/kernel.spec @@ -130,7 +130,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.16 -%define rpmversion 5.16.2 +%define rpmversion 5.16.3 %define patchversion 5.16 %define pkgrelease 200 @@ -692,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16.2.tar.xz +Source0: linux-5.16.3.tar.xz Source1: Makefile.rhelver @@ -1386,8 +1386,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16.2 -c -mv linux-5.16.2 linux-%{KVERREL} +%setup -q -n kernel-5.16.3 -c +mv linux-5.16.3 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2986,6 +2986,13 @@ fi # # %changelog +* Thu Jan 27 2022 Justin M. Forbes [5.16.3-200] +- Fix up changelog (Justin M. Forbes) +- Add file forgotten in simpledrm revert (Justin M. Forbes) + +* Thu Jan 27 2022 Justin M. Forbes [5.16.3-0] +- Revert "fedora: Disable fbdev drivers and use simpledrm instead" (Justin M. Forbes) + * Thu Jan 20 2022 Justin M. Forbes [5.16.2-0] - Add packaged but empty /lib/modules//systemtap/ (Justin M. Forbes) - Revert "[scsi] megaraid_sas: re-add certain pci-ids" (Justin M. Forbes) diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index 7da8ef2d8..a2d973bf5 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -17,8 +17,15 @@ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 +++++++++++++++------ drivers/firmware/efi/secureboot.c | 38 +++++++ - drivers/gpu/drm/amd/amdgpu/cik.c | 4 + - drivers/gpu/drm/amd/amdgpu/vi.c | 4 + + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 10 ++ + drivers/gpu/drm/i915/gt/intel_gt.c | 108 ++++++++++++++++++ + drivers/gpu/drm/i915/gt/intel_gt.h | 2 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 + + drivers/gpu/drm/i915/i915_reg.h | 11 ++ + drivers/gpu/drm/i915/i915_vma.c | 3 + + drivers/gpu/drm/i915/intel_uncore.c | 26 ++++- + drivers/gpu/drm/i915/intel_uncore.h | 2 + drivers/hid/hid-rmi.c | 64 ----------- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- @@ -44,10 +51,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + tools/testing/selftests/netfilter/nft_nat.sh | 5 +- - 46 files changed, 754 insertions(+), 191 deletions(-) + 53 files changed, 907 insertions(+), 195 deletions(-) diff --git a/Makefile b/Makefile -index dd98debc2604..1d65238a5bcf 100644 +index acb8ffee65dc..d41b475c83d3 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -395,11 +402,11 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 2c80765670bc..5245fad951d8 100644 +index 25d9f04f1995..c2fa1e98fb28 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1725,6 +1725,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) - if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) +@@ -1732,6 +1732,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) + if (!acpi_match_device_ids(device, ignore_serial_bus_ids)) return false; + /* @@ -505,7 +512,7 @@ index c59265146e9c..caa8458edde2 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/char/random.c b/drivers/char/random.c -index 7470ee24db2f..a3ac18f64ba7 100644 +index a27ae3999ff3..dc4e136adb08 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -335,6 +335,7 @@ @@ -538,7 +545,7 @@ index 7470ee24db2f..a3ac18f64ba7 100644 /********************************************************************** * * OS independent entropy store. Here are the functions which handle -@@ -1878,6 +1887,13 @@ random_poll(struct file *file, poll_table * wait) +@@ -1880,6 +1889,13 @@ random_poll(struct file *file, poll_table * wait) return mask; } @@ -552,7 +559,7 @@ index 7470ee24db2f..a3ac18f64ba7 100644 static int write_pool(struct entropy_store *r, const char __user *buffer, size_t count) { -@@ -1981,7 +1997,58 @@ static int random_fasync(int fd, struct file *filp, int on) +@@ -1983,7 +1999,58 @@ static int random_fasync(int fd, struct file *filp, int on) return fasync_helper(fd, filp, on, &fasync); } @@ -611,7 +618,7 @@ index 7470ee24db2f..a3ac18f64ba7 100644 .read = random_read, .write = random_write, .poll = random_poll, -@@ -1992,6 +2059,7 @@ const struct file_operations random_fops = { +@@ -1994,6 +2061,7 @@ const struct file_operations random_fops = { }; const struct file_operations urandom_fops = { @@ -619,7 +626,7 @@ index 7470ee24db2f..a3ac18f64ba7 100644 .read = urandom_read, .write = random_write, .unlocked_ioctl = random_ioctl, -@@ -2000,9 +2068,31 @@ const struct file_operations urandom_fops = { +@@ -2002,9 +2070,31 @@ const struct file_operations urandom_fops = { .llseek = noop_llseek, }; @@ -651,7 +658,7 @@ index 7470ee24db2f..a3ac18f64ba7 100644 int ret; if (flags & ~(GRND_NONBLOCK|GRND_RANDOM|GRND_INSECURE)) -@@ -2018,6 +2108,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, +@@ -2020,6 +2110,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, if (count > INT_MAX) count = INT_MAX; @@ -670,7 +677,7 @@ index 7470ee24db2f..a3ac18f64ba7 100644 if (!(flags & GRND_INSECURE) && !crng_ready()) { if (flags & GRND_NONBLOCK) return -EAGAIN; -@@ -2324,3 +2426,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size) +@@ -2329,3 +2431,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size) add_device_randomness(buf, size); } EXPORT_SYMBOL_GPL(add_bootloader_randomness); @@ -888,36 +895,307 @@ index 000000000000..de0a3714a5d4 + } + } +} -diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c -index 54f28c075f21..f10ce740a29c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/cik.c -+++ b/drivers/gpu/drm/amd/amdgpu/cik.c -@@ -1428,6 +1428,10 @@ static int cik_asic_reset(struct amdgpu_device *adev) - { - int r; +diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +index da85169006d4..a0aa6dbe120e 100644 +--- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h ++++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +@@ -305,6 +305,7 @@ struct drm_i915_gem_object { + #define I915_BO_READONLY BIT(6) + #define I915_TILING_QUIRK_BIT 7 /* unknown swizzling; do not release! */ + #define I915_BO_PROTECTED BIT(8) ++#define I915_BO_WAS_BOUND_BIT 9 + /** + * @mem_flags - Mutable placement-related flags + * +diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c +index 1d3f40abd025..0c85aa244f93 100644 +--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c ++++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c +@@ -10,6 +10,8 @@ + #include "i915_gem_lmem.h" + #include "i915_gem_mman.h" + ++#include "gt/intel_gt.h" ++ + void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, + struct sg_table *pages, + unsigned int sg_page_sizes) +@@ -217,6 +219,14 @@ __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj) + __i915_gem_object_reset_page_iter(obj); + obj->mm.page_sizes.phys = obj->mm.page_sizes.sg = 0; + ++ if (test_and_clear_bit(I915_BO_WAS_BOUND_BIT, &obj->flags)) { ++ struct drm_i915_private *i915 = to_i915(obj->base.dev); ++ intel_wakeref_t wakeref; ++ ++ with_intel_runtime_pm_if_active(&i915->runtime_pm, wakeref) ++ intel_gt_invalidate_tlbs(to_gt(i915)); ++ } ++ + return pages; + } -+ /* APUs don't have full asic reset */ -+ if (adev->flags & AMD_IS_APU) -+ return 0; +diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c +index 1cb1948ac959..d5c2a6c07b2f 100644 +--- a/drivers/gpu/drm/i915/gt/intel_gt.c ++++ b/drivers/gpu/drm/i915/gt/intel_gt.c +@@ -30,6 +30,8 @@ void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) + + spin_lock_init(>->irq_lock); + ++ mutex_init(>->tlb_invalidate_lock); ++ + INIT_LIST_HEAD(>->closed_vma); + spin_lock_init(>->closed_lock); + +@@ -907,3 +909,109 @@ void intel_gt_info_print(const struct intel_gt_info *info, + + intel_sseu_dump(&info->sseu, p); + } ++ ++struct reg_and_bit { ++ i915_reg_t reg; ++ u32 bit; ++}; ++ ++static struct reg_and_bit ++get_reg_and_bit(const struct intel_engine_cs *engine, const bool gen8, ++ const i915_reg_t *regs, const unsigned int num) ++{ ++ const unsigned int class = engine->class; ++ struct reg_and_bit rb = { }; ++ ++ if (drm_WARN_ON_ONCE(&engine->i915->drm, ++ class >= num || !regs[class].reg)) ++ return rb; ++ ++ rb.reg = regs[class]; ++ if (gen8 && class == VIDEO_DECODE_CLASS) ++ rb.reg.reg += 4 * engine->instance; /* GEN8_M2TCR */ ++ else ++ rb.bit = engine->instance; ++ ++ rb.bit = BIT(rb.bit); ++ ++ return rb; ++} ++ ++void intel_gt_invalidate_tlbs(struct intel_gt *gt) ++{ ++ static const i915_reg_t gen8_regs[] = { ++ [RENDER_CLASS] = GEN8_RTCR, ++ [VIDEO_DECODE_CLASS] = GEN8_M1TCR, /* , GEN8_M2TCR */ ++ [VIDEO_ENHANCEMENT_CLASS] = GEN8_VTCR, ++ [COPY_ENGINE_CLASS] = GEN8_BTCR, ++ }; ++ static const i915_reg_t gen12_regs[] = { ++ [RENDER_CLASS] = GEN12_GFX_TLB_INV_CR, ++ [VIDEO_DECODE_CLASS] = GEN12_VD_TLB_INV_CR, ++ [VIDEO_ENHANCEMENT_CLASS] = GEN12_VE_TLB_INV_CR, ++ [COPY_ENGINE_CLASS] = GEN12_BLT_TLB_INV_CR, ++ }; ++ struct drm_i915_private *i915 = gt->i915; ++ struct intel_uncore *uncore = gt->uncore; ++ struct intel_engine_cs *engine; ++ enum intel_engine_id id; ++ const i915_reg_t *regs; ++ unsigned int num = 0; ++ ++ if (I915_SELFTEST_ONLY(gt->awake == -ENODEV)) ++ return; ++ ++ if (GRAPHICS_VER(i915) == 12) { ++ regs = gen12_regs; ++ num = ARRAY_SIZE(gen12_regs); ++ } else if (GRAPHICS_VER(i915) >= 8 && GRAPHICS_VER(i915) <= 11) { ++ regs = gen8_regs; ++ num = ARRAY_SIZE(gen8_regs); ++ } else if (GRAPHICS_VER(i915) < 8) { ++ return; ++ } ++ ++ if (drm_WARN_ONCE(&i915->drm, !num, ++ "Platform does not implement TLB invalidation!")) ++ return; ++ ++ GEM_TRACE("\n"); ++ ++ assert_rpm_wakelock_held(&i915->runtime_pm); ++ ++ mutex_lock(>->tlb_invalidate_lock); ++ intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL); ++ ++ for_each_engine(engine, gt, id) { ++ /* ++ * HW architecture suggest typical invalidation time at 40us, ++ * with pessimistic cases up to 100us and a recommendation to ++ * cap at 1ms. We go a bit higher just in case. ++ */ ++ const unsigned int timeout_us = 100; ++ const unsigned int timeout_ms = 4; ++ struct reg_and_bit rb; ++ ++ rb = get_reg_and_bit(engine, regs == gen8_regs, regs, num); ++ if (!i915_mmio_reg_offset(rb.reg)) ++ continue; ++ ++ intel_uncore_write_fw(uncore, rb.reg, rb.bit); ++ if (__intel_wait_for_register_fw(uncore, ++ rb.reg, rb.bit, 0, ++ timeout_us, timeout_ms, ++ NULL)) ++ drm_err_ratelimited(>->i915->drm, ++ "%s TLB invalidation did not complete in %ums!\n", ++ engine->name, timeout_ms); ++ } ++ ++ /* ++ * Use delayed put since a) we mostly expect a flurry of TLB ++ * invalidations so it is good to avoid paying the forcewake cost and ++ * b) it works around a bug in Icelake which cannot cope with too rapid ++ * transitions. ++ */ ++ intel_uncore_forcewake_put_delayed(uncore, FORCEWAKE_ALL); ++ mutex_unlock(>->tlb_invalidate_lock); ++} +diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h +index 74e771871a9b..c0169d6017c2 100644 +--- a/drivers/gpu/drm/i915/gt/intel_gt.h ++++ b/drivers/gpu/drm/i915/gt/intel_gt.h +@@ -90,4 +90,6 @@ void intel_gt_info_print(const struct intel_gt_info *info, + + void intel_gt_watchdog_work(struct work_struct *work); + ++void intel_gt_invalidate_tlbs(struct intel_gt *gt); ++ + #endif /* __INTEL_GT_H__ */ +diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h +index 14216cc471b1..f20687796490 100644 +--- a/drivers/gpu/drm/i915/gt/intel_gt_types.h ++++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h +@@ -73,6 +73,8 @@ struct intel_gt { + + struct intel_uc uc; + ++ struct mutex tlb_invalidate_lock; ++ + struct i915_wa_list wa_list; + + struct intel_gt_timelines { +diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h +index bcee121bec5a..14ce8809efdd 100644 +--- a/drivers/gpu/drm/i915/i915_reg.h ++++ b/drivers/gpu/drm/i915/i915_reg.h +@@ -2697,6 +2697,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) + #define GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING (1 << 28) + #define GAMT_CHKN_DISABLE_I2M_CYCLE_ON_WR_PORT (1 << 24) + ++#define GEN8_RTCR _MMIO(0x4260) ++#define GEN8_M1TCR _MMIO(0x4264) ++#define GEN8_M2TCR _MMIO(0x4268) ++#define GEN8_BTCR _MMIO(0x426c) ++#define GEN8_VTCR _MMIO(0x4270) ++ + #if 0 + #define PRB0_TAIL _MMIO(0x2030) + #define PRB0_HEAD _MMIO(0x2034) +@@ -2792,6 +2798,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) + #define FAULT_VA_HIGH_BITS (0xf << 0) + #define FAULT_GTT_SEL (1 << 4) + ++#define GEN12_GFX_TLB_INV_CR _MMIO(0xced8) ++#define GEN12_VD_TLB_INV_CR _MMIO(0xcedc) ++#define GEN12_VE_TLB_INV_CR _MMIO(0xcee0) ++#define GEN12_BLT_TLB_INV_CR _MMIO(0xcee4) ++ + #define GEN12_AUX_ERR_DBG _MMIO(0x43f4) + + #define FPGA_DBG _MMIO(0x42300) +diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c +index bef795e265a6..cb288e6bdc02 100644 +--- a/drivers/gpu/drm/i915/i915_vma.c ++++ b/drivers/gpu/drm/i915/i915_vma.c +@@ -431,6 +431,9 @@ int i915_vma_bind(struct i915_vma *vma, + vma->ops->bind_vma(vma->vm, NULL, vma, cache_level, bind_flags); + } + ++ if (vma->obj) ++ set_bit(I915_BO_WAS_BOUND_BIT, &vma->obj->flags); + - if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) { - dev_info(adev->dev, "BACO reset\n"); - r = amdgpu_dpm_baco_reset(adev); -diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c -index fe9a7cc8d9eb..6645ebbd2696 100644 ---- a/drivers/gpu/drm/amd/amdgpu/vi.c -+++ b/drivers/gpu/drm/amd/amdgpu/vi.c -@@ -956,6 +956,10 @@ static int vi_asic_reset(struct amdgpu_device *adev) + atomic_or(bind_flags, &vma->flags); + return 0; + } +diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c +index e072054adac5..e21c779cb487 100644 +--- a/drivers/gpu/drm/i915/intel_uncore.c ++++ b/drivers/gpu/drm/i915/intel_uncore.c +@@ -724,7 +724,8 @@ void intel_uncore_forcewake_get__locked(struct intel_uncore *uncore, + } + + static void __intel_uncore_forcewake_put(struct intel_uncore *uncore, +- enum forcewake_domains fw_domains) ++ enum forcewake_domains fw_domains, ++ bool delayed) { - int r; + struct intel_uncore_forcewake_domain *domain; + unsigned int tmp; +@@ -739,7 +740,11 @@ static void __intel_uncore_forcewake_put(struct intel_uncore *uncore, + continue; + } -+ /* APUs don't have full asic reset */ -+ if (adev->flags & AMD_IS_APU) -+ return 0; +- fw_domains_put(uncore, domain->mask); ++ if (delayed && ++ !(domain->uncore->fw_domains_timer & domain->mask)) ++ fw_domain_arm_timer(domain); ++ else ++ fw_domains_put(uncore, domain->mask); + } + } + +@@ -760,7 +765,20 @@ void intel_uncore_forcewake_put(struct intel_uncore *uncore, + return; + + spin_lock_irqsave(&uncore->lock, irqflags); +- __intel_uncore_forcewake_put(uncore, fw_domains); ++ __intel_uncore_forcewake_put(uncore, fw_domains, false); ++ spin_unlock_irqrestore(&uncore->lock, irqflags); ++} ++ ++void intel_uncore_forcewake_put_delayed(struct intel_uncore *uncore, ++ enum forcewake_domains fw_domains) ++{ ++ unsigned long irqflags; ++ ++ if (!uncore->fw_get_funcs) ++ return; + - if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) { - dev_info(adev->dev, "BACO reset\n"); - r = amdgpu_dpm_baco_reset(adev); ++ spin_lock_irqsave(&uncore->lock, irqflags); ++ __intel_uncore_forcewake_put(uncore, fw_domains, true); + spin_unlock_irqrestore(&uncore->lock, irqflags); + } + +@@ -802,7 +820,7 @@ void intel_uncore_forcewake_put__locked(struct intel_uncore *uncore, + if (!uncore->fw_get_funcs) + return; + +- __intel_uncore_forcewake_put(uncore, fw_domains); ++ __intel_uncore_forcewake_put(uncore, fw_domains, false); + } + + void assert_forcewakes_inactive(struct intel_uncore *uncore) +diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h +index 3248e4e2c540..d08088fa4c7e 100644 +--- a/drivers/gpu/drm/i915/intel_uncore.h ++++ b/drivers/gpu/drm/i915/intel_uncore.h +@@ -243,6 +243,8 @@ void intel_uncore_forcewake_get(struct intel_uncore *uncore, + enum forcewake_domains domains); + void intel_uncore_forcewake_put(struct intel_uncore *uncore, + enum forcewake_domains domains); ++void intel_uncore_forcewake_put_delayed(struct intel_uncore *uncore, ++ enum forcewake_domains domains); + void intel_uncore_forcewake_flush(struct intel_uncore *uncore, + enum forcewake_domains fw_domains); + diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 311eee599ce9..2460c6bd46f8 100644 --- a/drivers/hid/hid-rmi.c @@ -1262,7 +1540,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index dd7863e453a5..6759ef17a2c3 100644 +index 8b86406b7162..2dffe129b902 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -7,6 +7,7 @@ @@ -1273,7 +1551,7 @@ index dd7863e453a5..6759ef17a2c3 100644 #include #include #include -@@ -3118,6 +3119,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) +@@ -3119,6 +3120,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); @@ -1438,10 +1716,10 @@ index 9b095ee01364..bf25ef206cd2 100644 { } diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 003950c738d2..ef27596d04d8 100644 +index 20a932690738..494cee3aec7b 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4269,6 +4269,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4272,6 +4272,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); @@ -1473,10 +1751,10 @@ index 003950c738d2..ef27596d04d8 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 3bc4a86c3d0a..e346da4f58f2 100644 +index ac6c5ccfe1cb..ec784479eece 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5666,6 +5666,13 @@ static void hub_event(struct work_struct *work) +@@ -5669,6 +5669,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); diff --git a/sources b/sources index c9ce029b0..1f62872b7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294 -SHA512 (linux-5.16.2.tar.xz) = 3d52d7447221cfaf276104639133ceab8988b2350229ec60684d1fb77dd8df656998d53591182531a00c647a23c0244aad0c822c872f6afb5c5cb1b90e39c5c3 -SHA512 (kernel-abi-stablelists-5.16.2-200.tar.bz2) = 0eb5c16964c8a5fdcd247fbd41cdb5df5286227c37c6470725a785ce718c5ea6824d84c2c16a40bd4d687905bd6fa1ad5983b3ab87d5929f011a7bfcee13fd64 -SHA512 (kernel-kabi-dw-5.16.2-200.tar.bz2) = 77af2f3b4f5c0aef169102cc4ee34f97fdd4dcc0b7f338ac4b5d214884f8e8479cfb242fa634857cbc51cd5d6d30f027d0a9fe7bf0c0a311bf6979324a252433 +SHA512 (linux-5.16.3.tar.xz) = 376adb3b8067870b73e59a4a84cf775b0bcd9e859ace957b96306c85b886cbe0b8d0f0de8e4758ad8588799b823b880f5f213f3128ace807882b1d0ff8aeec3a +SHA512 (kernel-abi-stablelists-5.16.3-200.tar.bz2) = fbb9473e1aa2ff161066d4e8a980944a226f5ddab77b3d831328c6ee64fa7e823cfac354cb14ce0676107e0a130e043da7bd688bbf2cdfcc28728ddc9da18567 +SHA512 (kernel-kabi-dw-5.16.3-200.tar.bz2) = e07eae3d5ccda7e8b014a8a418e287820f0c826f13b6191683920a100201293f4705b854856314fe23a1d06c70fdf5a4f7f7443e4527d7757660a807b93f7688 -- cgit