From c45e5994bf27033db30d7b6987c555bb42907ac9 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jeremy@jcline.org>
Date: Wed, 18 Apr 2018 13:40:24 -0400
Subject: [PATCH] Enable CONFIG_DRM on s390x (rhbz 1569086)

---
 configs/fedora/generic/s390x/CONFIG_DRM | 1 -
 kernel-s390x-debug.config               | 2 +-
 kernel-s390x.config                     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 configs/fedora/generic/s390x/CONFIG_DRM

diff --git a/configs/fedora/generic/s390x/CONFIG_DRM b/configs/fedora/generic/s390x/CONFIG_DRM
deleted file mode 100644
index c9d4b0f66..000000000
--- a/configs/fedora/generic/s390x/CONFIG_DRM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 7366eb465..a4ab1a0e4 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -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
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 6e63791c1..7b03cb78e 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -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