From 572a49234e31b95b7201aa700744cc78b0e98b52 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 11 Oct 2018 14:00:01 -0400 Subject: Disable DRM settings for impossible hardware on s390x (rhbz 1637914) Signed-off-by: Jeremy Cline --- configs/fedora/generic/s390x/CONFIG_DRM_AMDGPU | 1 + configs/fedora/generic/s390x/CONFIG_DRM_AST | 1 + configs/fedora/generic/s390x/CONFIG_DRM_BOCHS | 1 + .../fedora/generic/s390x/CONFIG_DRM_CIRRUS_QEMU | 1 + configs/fedora/generic/s390x/CONFIG_DRM_I2C_CH7006 | 1 + .../generic/s390x/CONFIG_DRM_I2C_NXP_TDA998X | 1 + configs/fedora/generic/s390x/CONFIG_DRM_I2C_SIL164 | 1 + .../generic/s390x/CONFIG_DRM_LOAD_EDID_FIRMWARE | 1 + configs/fedora/generic/s390x/CONFIG_DRM_MGAG200 | 1 + configs/fedora/generic/s390x/CONFIG_DRM_NOUVEAU | 1 + configs/fedora/generic/s390x/CONFIG_DRM_QXL | 1 + configs/fedora/generic/s390x/CONFIG_DRM_RADEON | 1 + kernel-s390x-debug.config | 24 +++++++++++----------- kernel-s390x.config | 24 +++++++++++----------- 14 files changed, 36 insertions(+), 24 deletions(-) create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_AMDGPU create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_AST create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_BOCHS create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_CIRRUS_QEMU create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_I2C_CH7006 create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_I2C_NXP_TDA998X create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_I2C_SIL164 create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_LOAD_EDID_FIRMWARE create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_MGAG200 create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_NOUVEAU create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_QXL create mode 100644 configs/fedora/generic/s390x/CONFIG_DRM_RADEON diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_AMDGPU b/configs/fedora/generic/s390x/CONFIG_DRM_AMDGPU new file mode 100644 index 000000000..b2d5e0217 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_AMDGPU @@ -0,0 +1 @@ +# CONFIG_DRM_AMDGPU is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_AST b/configs/fedora/generic/s390x/CONFIG_DRM_AST new file mode 100644 index 000000000..bb4ed4ad2 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_AST @@ -0,0 +1 @@ +# CONFIG_DRM_AST is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_BOCHS b/configs/fedora/generic/s390x/CONFIG_DRM_BOCHS new file mode 100644 index 000000000..51413a5ec --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_BOCHS @@ -0,0 +1 @@ +# CONFIG_DRM_BOCHS is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_CIRRUS_QEMU b/configs/fedora/generic/s390x/CONFIG_DRM_CIRRUS_QEMU new file mode 100644 index 000000000..aee7bc74d --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_CIRRUS_QEMU @@ -0,0 +1 @@ +# CONFIG_DRM_CIRRUS_QEMU is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_I2C_CH7006 b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_CH7006 new file mode 100644 index 000000000..07efc3d47 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_CH7006 @@ -0,0 +1 @@ +# CONFIG_DRM_I2C_CH7006 is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_I2C_NXP_TDA998X b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_NXP_TDA998X new file mode 100644 index 000000000..b04038c91 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_NXP_TDA998X @@ -0,0 +1 @@ +# CONFIG_DRM_I2C_NXP_TDA998X is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_I2C_SIL164 b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_SIL164 new file mode 100644 index 000000000..44078d9b6 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_SIL164 @@ -0,0 +1 @@ +# CONFIG_DRM_I2C_SIL164 is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_LOAD_EDID_FIRMWARE b/configs/fedora/generic/s390x/CONFIG_DRM_LOAD_EDID_FIRMWARE new file mode 100644 index 000000000..de609436d --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_LOAD_EDID_FIRMWARE @@ -0,0 +1 @@ +# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_MGAG200 b/configs/fedora/generic/s390x/CONFIG_DRM_MGAG200 new file mode 100644 index 000000000..1f5d73662 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_MGAG200 @@ -0,0 +1 @@ +# CONFIG_DRM_MGAG200 is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_NOUVEAU b/configs/fedora/generic/s390x/CONFIG_DRM_NOUVEAU new file mode 100644 index 000000000..c89c944cc --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_NOUVEAU @@ -0,0 +1 @@ +# CONFIG_DRM_NOUVEAU is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_QXL b/configs/fedora/generic/s390x/CONFIG_DRM_QXL new file mode 100644 index 000000000..cad6912c5 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_QXL @@ -0,0 +1 @@ +# CONFIG_DRM_QXL is not set diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_RADEON b/configs/fedora/generic/s390x/CONFIG_DRM_RADEON new file mode 100644 index 000000000..f0807fbf6 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_DRM_RADEON @@ -0,0 +1 @@ +# CONFIG_DRM_RADEON is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 1cdb54e78..d45722973 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1161,16 +1161,16 @@ CONFIG_DRM_AMD_ACP=y CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set -CONFIG_DRM_AMDGPU=m +# CONFIG_DRM_AMDGPU is not set CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m # CONFIG_DRM_ARCPGU is not set -CONFIG_DRM_AST=m -CONFIG_DRM_BOCHS=m +# CONFIG_DRM_AST is not set +# CONFIG_DRM_BOCHS is not set # CONFIG_DRM_CDNS_DSI is not set -CONFIG_DRM_CIRRUS_QEMU=m +# CONFIG_DRM_CIRRUS_QEMU is not set # CONFIG_DRM_DEBUG_MM_SELFTEST is not set # CONFIG_DRM_DEBUG_SELFTEST is not set CONFIG_DRM_DP_AUX_CHARDEV=y @@ -1183,19 +1183,19 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_I2C_ADV7511 is not set CONFIG_DRM_I2C_ADV7533=y -CONFIG_DRM_I2C_CH7006=m +# CONFIG_DRM_I2C_CH7006 is not set # CONFIG_DRM_I2C_NXP_TDA9950 is not set -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_I2C_SIL164=m +# CONFIG_DRM_I2C_NXP_TDA998X is not set +# CONFIG_DRM_I2C_SIL164 is not set # CONFIG_DRM_LEGACY is not set -CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_LOAD_EDID_FIRMWARE 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=m +# CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU=m +# CONFIG_DRM_NOUVEAU is not set # CONFIG_DRM_NXP_PTN3460 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set @@ -1218,8 +1218,8 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m # 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_RADEON=m +# CONFIG_DRM_QXL is not set +# CONFIG_DRM_RADEON is not set CONFIG_DRM_RADEON_USERPTR=y # CONFIG_DRM_RCAR_DW_HDMI is not set # CONFIG_DRM_RCAR_LVDS is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index f5e7ddd07..b3f07400a 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1148,16 +1148,16 @@ CONFIG_DRM_AMD_ACP=y CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set -CONFIG_DRM_AMDGPU=m +# CONFIG_DRM_AMDGPU is not set CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y CONFIG_DRM_ANALOGIX_ANX78XX=m # CONFIG_DRM_ARCPGU is not set -CONFIG_DRM_AST=m -CONFIG_DRM_BOCHS=m +# CONFIG_DRM_AST is not set +# CONFIG_DRM_BOCHS is not set # CONFIG_DRM_CDNS_DSI is not set -CONFIG_DRM_CIRRUS_QEMU=m +# CONFIG_DRM_CIRRUS_QEMU is not set # CONFIG_DRM_DEBUG_MM_SELFTEST is not set # CONFIG_DRM_DEBUG_SELFTEST is not set CONFIG_DRM_DP_AUX_CHARDEV=y @@ -1170,19 +1170,19 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_I2C_ADV7511 is not set CONFIG_DRM_I2C_ADV7533=y -CONFIG_DRM_I2C_CH7006=m +# CONFIG_DRM_I2C_CH7006 is not set # CONFIG_DRM_I2C_NXP_TDA9950 is not set -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_I2C_SIL164=m +# CONFIG_DRM_I2C_NXP_TDA998X is not set +# CONFIG_DRM_I2C_SIL164 is not set # CONFIG_DRM_LEGACY is not set -CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_LOAD_EDID_FIRMWARE 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=m +# CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU=m +# CONFIG_DRM_NOUVEAU is not set # CONFIG_DRM_NXP_PTN3460 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set @@ -1205,8 +1205,8 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m # 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_RADEON=m +# CONFIG_DRM_QXL is not set +# CONFIG_DRM_RADEON is not set CONFIG_DRM_RADEON_USERPTR=y # CONFIG_DRM_RCAR_DW_HDMI is not set # CONFIG_DRM_RCAR_LVDS is not set -- cgit