From 613cf10377720aba5442b92c86674b1bb663d8a3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 29 Jan 2018 22:28:36 +0000 Subject: Filter GPU bridge drivers on all arches, re-enable adv7511 --- configs/fedora/generic/CONFIG_DRM_I2C_ADV7511 | 2 +- configs/fedora/generic/CONFIG_DRM_I2C_ADV7511_CEC | 2 +- filter-aarch64.sh | 2 +- filter-armv7hl.sh | 2 +- filter-modules.sh | 2 +- kernel-aarch64-debug.config | 4 ++-- kernel-aarch64.config | 4 ++-- kernel-armv7hl-debug.config | 4 ++-- kernel-armv7hl-lpae-debug.config | 4 ++-- kernel-armv7hl-lpae.config | 4 ++-- kernel-armv7hl.config | 4 ++-- kernel-i686-PAE.config | 4 ++-- kernel-i686-PAEdebug.config | 4 ++-- kernel-i686-debug.config | 4 ++-- kernel-i686.config | 4 ++-- kernel-ppc64-debug.config | 4 ++-- kernel-ppc64.config | 4 ++-- kernel-ppc64le-debug.config | 4 ++-- kernel-ppc64le.config | 4 ++-- kernel-s390x-debug.config | 4 ++-- kernel-s390x.config | 4 ++-- kernel-x86_64-debug.config | 4 ++-- kernel-x86_64.config | 4 ++-- kernel.spec | 3 +++ 24 files changed, 44 insertions(+), 41 deletions(-) diff --git a/configs/fedora/generic/CONFIG_DRM_I2C_ADV7511 b/configs/fedora/generic/CONFIG_DRM_I2C_ADV7511 index 18208c93f..2d931f712 100644 --- a/configs/fedora/generic/CONFIG_DRM_I2C_ADV7511 +++ b/configs/fedora/generic/CONFIG_DRM_I2C_ADV7511 @@ -1 +1 @@ -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511=m diff --git a/configs/fedora/generic/CONFIG_DRM_I2C_ADV7511_CEC b/configs/fedora/generic/CONFIG_DRM_I2C_ADV7511_CEC index 25530967a..42e87e034 100644 --- a/configs/fedora/generic/CONFIG_DRM_I2C_ADV7511_CEC +++ b/configs/fedora/generic/CONFIG_DRM_I2C_ADV7511_CEC @@ -1 +1 @@ -# CONFIG_DRM_I2C_ADV7511_CEC is not set +CONFIG_DRM_I2C_ADV7511_CEC=y diff --git a/filter-aarch64.sh b/filter-aarch64.sh index 4ca60946f..e5cd1a98c 100644 --- a/filter-aarch64.sh +++ b/filter-aarch64.sh @@ -13,6 +13,6 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds medi ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom" -drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i sun4i-drm-hdmi tinydrm vc4" +drmdrvs="amd arm ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i sun4i-drm-hdmi tinydrm vc4" singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr" diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh index c08e03d12..9044f53b9 100644 --- a/filter-armv7hl.sh +++ b/filter-armv7hl.sh @@ -13,6 +13,6 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn media mem ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom" -drmdrvs="amd armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm omapdrm panel nouveau radeon rockchip sti sun4i sun4i-drm-hdmi tegra tilcdc tinydrm via vc4" +drmdrvs="amd armada ast exynos etnaviv hisilicon i2c imx meson mgag200 msm omapdrm panel nouveau radeon rockchip sti sun4i sun4i-drm-hdmi tegra tilcdc tinydrm via vc4" singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr bq27xxx_battery_hdq" diff --git a/filter-modules.sh b/filter-modules.sh index 972372411..f7d594341 100755 --- a/filter-modules.sh +++ b/filter-modules.sh @@ -32,7 +32,7 @@ fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 oc netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp wireless" -drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via " +drmdrvs="amd ast bridge gma500 i2c i915 mgag200 nouveau radeon via " singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr parport_serial" diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index a3152a988..a2e7d11ac 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1291,8 +1291,8 @@ CONFIG_DRM_HDLCD=m CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_HISI_KIRIN=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 00f82def1..fb414d3cd 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1281,8 +1281,8 @@ CONFIG_DRM_HDLCD=m CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_HISI_KIRIN=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 44809c3e7..eedad1130 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1372,8 +1372,8 @@ CONFIG_DRM_HDLCD=m # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 3f63064dd..73d42c6ba 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1315,8 +1315,8 @@ CONFIG_DRM_HDLCD=m # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index b42356542..8f072b706 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1305,8 +1305,8 @@ CONFIG_DRM_HDLCD=m # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 8f496beb2..3ae43f309 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1362,8 +1362,8 @@ CONFIG_DRM_HDLCD=m # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 7d2eeff10..d6d18d184 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1135,8 +1135,8 @@ CONFIG_DRM_GMA500=m # CONFIG_DRM_GMA600 is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 66eff4bd4..b1bf1d94a 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -1146,8 +1146,8 @@ CONFIG_DRM_GMA500=m # CONFIG_DRM_GMA600 is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index ae3147718..3c2c0016a 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1146,8 +1146,8 @@ CONFIG_DRM_GMA500=m # CONFIG_DRM_GMA600 is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-i686.config b/kernel-i686.config index e6a81c4fb..4bf9d5c7e 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1135,8 +1135,8 @@ CONFIG_DRM_GMA500=m # CONFIG_DRM_GMA600 is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 1d25295e0..10e041b1f 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -1108,8 +1108,8 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index d5d3f5d0d..ff6d7173e 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -1097,8 +1097,8 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 6d5162f79..828aafb03 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1063,8 +1063,8 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 6b1a70787..a29beee9b 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1052,8 +1052,8 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 598d7165f..768b0df86 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1063,8 +1063,8 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 1f7a53fa7..71ac47a8d 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1052,8 +1052,8 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index a9ce3a5a6..ae141b5eb 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1192,8 +1192,8 @@ CONFIG_DRM_GMA500=m # CONFIG_DRM_GMA600 is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index e35b4df4c..f7437e2b1 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1181,8 +1181,8 @@ CONFIG_DRM_GMA500=m # CONFIG_DRM_GMA600 is not set CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -# CONFIG_DRM_I2C_ADV7511_CEC is not set -# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/kernel.spec b/kernel.spec index 6fbc7c521..695c8dbe0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1905,6 +1905,9 @@ fi # # %changelog +* Mon Jan 29 2018 Peter Robinson +- Filter GPU bridge drivers on all arches, re-enable adv7511 + * Mon Jan 29 2018 Justin M. Forbes - Fix CVE-2018-5750 (rhbz 1539706 1539708) -- cgit