summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Cline <jeremy@jcline.org>2018-04-19 15:23:57 -0400
committerJeremy Cline <jeremy@jcline.org>2018-04-19 15:23:57 -0400
commit83c9dc6967efc54e798b489945cff3cf04f821c5 (patch)
tree8ae43899ff09ddc2c351c12f58d186e1fbda80ea
parentb9b2a331d5d785499708dfb84bcb2f92edc27636 (diff)
downloadkernel-83c9dc6967efc54e798b489945cff3cf04f821c5.tar.gz
kernel-83c9dc6967efc54e798b489945cff3cf04f821c5.tar.xz
kernel-83c9dc6967efc54e798b489945cff3cf04f821c5.zip
Enable CONFIG_DRM on s390x for real (rhbz 1569086)
This only works with 4.17.
-rw-r--r--configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_DRM2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_DRM_PANEL1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_FB2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_HWMON2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_MFD_CORE2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_SYNC_FILE1
-rw-r--r--kernel-s390x-debug.config18
-rw-r--r--kernel-s390x.config18
11 files changed, 27 insertions, 25 deletions
diff --git a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
index 9cd604bc5..7073bf67e 100644
--- a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
+++ b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
@@ -1 +1 @@
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
diff --git a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
index 3ee77acd7..ac802ca1c 100644
--- a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
+++ b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
@@ -1 +1 @@
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM b/configs/fedora/generic/s390x/CONFIG_DRM
index c9d4b0f66..1ba603c1c 100644
--- a/configs/fedora/generic/s390x/CONFIG_DRM
+++ b/configs/fedora/generic/s390x/CONFIG_DRM
@@ -1 +1 @@
-# CONFIG_DRM is not set
+CONFIG_DRM=m
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_PANEL b/configs/fedora/generic/s390x/CONFIG_DRM_PANEL
new file mode 100644
index 000000000..de8a9c247
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_PANEL
@@ -0,0 +1 @@
+CONFIG_DRM_PANEL=y
diff --git a/configs/fedora/generic/s390x/CONFIG_FB b/configs/fedora/generic/s390x/CONFIG_FB
index 7310c1a02..093b4f67e 100644
--- a/configs/fedora/generic/s390x/CONFIG_FB
+++ b/configs/fedora/generic/s390x/CONFIG_FB
@@ -1 +1 @@
-# CONFIG_FB is not set
+CONFIG_FB=m
diff --git a/configs/fedora/generic/s390x/CONFIG_HWMON b/configs/fedora/generic/s390x/CONFIG_HWMON
index 65c3ac9f5..d67f2b72f 100644
--- a/configs/fedora/generic/s390x/CONFIG_HWMON
+++ b/configs/fedora/generic/s390x/CONFIG_HWMON
@@ -1 +1 @@
-# CONFIG_HWMON is not set
+CONFIG_HWMON=m
diff --git a/configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT b/configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT
index e374ebd3c..75e39f8b6 100644
--- a/configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT
+++ b/configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT
@@ -1 +1 @@
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=m
diff --git a/configs/fedora/generic/s390x/CONFIG_MFD_CORE b/configs/fedora/generic/s390x/CONFIG_MFD_CORE
index 61d91aa6e..c8855e8a0 100644
--- a/configs/fedora/generic/s390x/CONFIG_MFD_CORE
+++ b/configs/fedora/generic/s390x/CONFIG_MFD_CORE
@@ -1 +1 @@
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=m
diff --git a/configs/fedora/generic/s390x/CONFIG_SYNC_FILE b/configs/fedora/generic/s390x/CONFIG_SYNC_FILE
new file mode 100644
index 000000000..391ab547b
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_SYNC_FILE
@@ -0,0 +1 @@
+CONFIG_SYNC_FILE=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 24376c375..75eccd295 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -306,10 +306,10 @@ CONFIG_B53_SRAB_DRIVER=m
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_ARCXCNN=m
# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3630 is not set
# CONFIG_BACKLIGHT_LM3639 is not set
@@ -1087,10 +1087,10 @@ CONFIG_DRM_I2C_ADV7533=y
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_NXP_TDA998X=m
CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM is not set
# CONFIG_DRM_LEGACY is not set
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LVDS_ENCODER is not set
+CONFIG_DRM=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MGA is not set
@@ -1100,7 +1100,6 @@ CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_NXP_PTN3460 is not set
# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL is not set
# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_LG_LG4573 is not set
# CONFIG_DRM_PANEL_LVDS is not set
@@ -1117,6 +1116,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
# CONFIG_DRM_PANEL_SIMPLE is not set
# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+CONFIG_DRM_PANEL=y
# CONFIG_DRM_PARADE_PS8622 is not set
CONFIG_DRM_QXL=m
# CONFIG_DRM_R128 is not set
@@ -1353,8 +1353,8 @@ CONFIG_FB_EFI=y
# CONFIG_FB_I740 is not set
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
# CONFIG_FB_KYRO is not set
+CONFIG_FB=m
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1738,7 +1738,7 @@ CONFIG_HVC_IUCV=y
CONFIG_HW_CONSOLE=y
CONFIG_HWLAT_TRACER=y
# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_HWMON is not set
+CONFIG_HWMON=m
CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_S390=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -1751,7 +1751,7 @@ CONFIG_HYSDN_CAPI=y
CONFIG_HYSDN=m
# CONFIG_HZ_1000 is not set
CONFIG_HZ_100=y
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_ALGOPCA is not set
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALI1535 is not set
@@ -2704,7 +2704,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
@@ -4979,7 +4979,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SWAP=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9500 is not set
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
# CONFIG_SYNCLINK_CS is not set
CONFIG_SYNCLINK_GT=m
CONFIG_SYNCLINK=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 6699a3f53..ae4361772 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -305,10 +305,10 @@ CONFIG_B53_SRAB_DRIVER=m
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_ARCXCNN=m
# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3630 is not set
# CONFIG_BACKLIGHT_LM3639 is not set
@@ -1076,10 +1076,10 @@ CONFIG_DRM_I2C_ADV7533=y
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_NXP_TDA998X=m
CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM is not set
# CONFIG_DRM_LEGACY is not set
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LVDS_ENCODER is not set
+CONFIG_DRM=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MGA is not set
@@ -1089,7 +1089,6 @@ CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_NXP_PTN3460 is not set
# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL is not set
# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_LG_LG4573 is not set
# CONFIG_DRM_PANEL_LVDS is not set
@@ -1106,6 +1105,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
# CONFIG_DRM_PANEL_SIMPLE is not set
# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+CONFIG_DRM_PANEL=y
# CONFIG_DRM_PARADE_PS8622 is not set
CONFIG_DRM_QXL=m
# CONFIG_DRM_R128 is not set
@@ -1334,8 +1334,8 @@ CONFIG_FB_EFI=y
# CONFIG_FB_I740 is not set
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
# CONFIG_FB_KYRO is not set
+CONFIG_FB=m
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1719,7 +1719,7 @@ CONFIG_HVC_IUCV=y
CONFIG_HW_CONSOLE=y
CONFIG_HWLAT_TRACER=y
# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_HWMON is not set
+CONFIG_HWMON=m
CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_S390=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -1732,7 +1732,7 @@ CONFIG_HYSDN_CAPI=y
CONFIG_HYSDN=m
# CONFIG_HZ_1000 is not set
CONFIG_HZ_100=y
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_ALGOPCA is not set
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALI1535 is not set
@@ -2682,7 +2682,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
@@ -4954,7 +4954,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SWAP=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9500 is not set
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
# CONFIG_SYNCLINK_CS is not set
CONFIG_SYNCLINK_GT=m
CONFIG_SYNCLINK=m