Revert FB changes for s390 while I debug

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

2 files changed, 14 insertions, 16 deletions

diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 4401d26c8..84bb1fb98 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1347,7 +1347,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
@@ -1377,6 +1376,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_LVDS_ENCODER is not set
+CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_MGA is not set
@@ -1464,7 +1464,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_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TIDSS=m
@@ -1488,7 +1488,6 @@ CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
 # CONFIG_DRM_XEN is not set
-CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@@ -1726,7 +1725,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
@@ -1758,7 +1757,7 @@ CONFIG_FB=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
@@ -2188,7 +2187,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
@@ -2224,6 +2223,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
@@ -2263,7 +2263,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
@@ -6346,7 +6345,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 1fa2d7868..8fcea456d 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1338,7 +1338,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
@@ -1368,6 +1367,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 CONFIG_DRM_LONTIUM_LT9611UXC=m
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_LVDS_ENCODER is not set
+CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_MGA is not set
@@ -1455,7 +1455,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_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TIDSS=m
@@ -1479,7 +1479,6 @@ CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
 # CONFIG_DRM_XEN_FRONTEND is not set
 # CONFIG_DRM_XEN is not set
-CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@@ -1709,7 +1708,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
@@ -1741,7 +1740,7 @@ CONFIG_FB=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
@@ -2171,7 +2170,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
@@ -2207,6 +2206,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
@@ -2246,7 +2246,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
@@ -6320,7 +6319,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=""