Merge remote-tracking branch 'origin/f29' into f29-user-thl-vanilla-fedora

24 files changed, 184 insertions, 59 deletions

diff --git a/CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch b/CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch
new file mode 100644
index 000000000..2888fb6de
--- /dev/null
+++ b/CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch
@@ -0,0 +1,60 @@
+From patchwork Thu Sep 27 20:57:30 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [CI, 1/6] drm/i915/dp: Fix link retraining comment in
+ intel_dp_long_pulse()
+From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
+X-Patchwork-Id: 253516
+Message-Id: <20180927205735.16651-1-dhinakaran.pandiyan@intel.com>
+To: intel-gfx@lists.freedesktop.org
+Date: Thu, 27 Sep 2018 13:57:30 -0700
+
+Comment claims link needs to be retrained because the connected sink raised
+a long pulse to indicate link loss. If the sink did so,
+intel_dp_hotplug() would have handled link retraining. Looking at the
+logs in Bugzilla referenced in commit '3cf71bc9904d ("drm/i915: Re-apply
+Perform link quality check, unconditionally during long pulse"")', the
+issue is that the sink does not trigger an interrupt. What we want is
+->detect() from user space to check link status and retrain. Ville's
+review for the original patch also indicates the same root cause. So,
+rewrite the comment.
+
+v2: Patch split and rewrote comment.
+
+Cc: Lyude Paul <lyude@redhat.com>
+Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Cc: Jani Nikula <jani.nikula@linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Cc: Jan-Marek Glogowski <glogow@fbihome.de>
+References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")
+Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
+Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+---
+ drivers/gpu/drm/i915/intel_dp.c | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index 256a71c8c093..207b3ea2ed1a 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -5074,16 +5074,9 @@ intel_dp_long_pulse(struct intel_connector *connector,
+ 		goto out;
+ 	} else {
+ 		/*
+-		 * If display is now connected check links status,
+-		 * there has been known issues of link loss triggering
+-		 * long pulse.
+-		 *
+-		 * Some sinks (eg. ASUS PB287Q) seem to perform some
+-		 * weird HPD ping pong during modesets. So we can apparently
+-		 * end up with HPD going low during a modeset, and then
+-		 * going back up soon after. And once that happens we must
+-		 * retrain the link to get a picture. That's in case no
+-		 * userspace component reacted to intermittent HPD dip.
++		 * Some external monitors do not signal loss of link
++		 * synchronization with an IRQ_HPD, so force a link status
++		 * check.
+ 		 */
+ 		struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
+ 
diff --git a/CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch b/CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch
new file mode 100644
index 000000000..bb9106d05
--- /dev/null
+++ b/CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch
@@ -0,0 +1,55 @@
+From patchwork Thu Sep 27 20:57:31 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [CI, 2/6] drm/i915/dp: Restrict link retrain workaround to external
+ monitors
+From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
+X-Patchwork-Id: 253514
+Message-Id: <20180927205735.16651-2-dhinakaran.pandiyan@intel.com>
+To: intel-gfx@lists.freedesktop.org
+Date: Thu, 27 Sep 2018 13:57:31 -0700
+
+Commit '3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check,
+unconditionally during long pulse"")' applies a work around for sinks
+that don't signal link loss. The work around does not need to have to be
+that broad as the issue was seen with only one particular monitor; limit
+this only for external displays as eDP features like PSR turn off the link
+and the driver ends up retraining the link seeeing that link is not
+synchronized.
+
+Cc: Lyude Paul <lyude@redhat.com>
+Cc: Jan-Marek Glogowski <glogow@fbihome.de>
+Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
+References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")
+Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
+Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+---
+ drivers/gpu/drm/i915/intel_dp.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index 207b3ea2ed1a..4e0870f3a4a5 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -5072,12 +5072,13 @@ intel_dp_long_pulse(struct intel_connector *connector,
+ 		 */
+ 		status = connector_status_disconnected;
+ 		goto out;
+-	} else {
+-		/*
+-		 * Some external monitors do not signal loss of link
+-		 * synchronization with an IRQ_HPD, so force a link status
+-		 * check.
+-		 */
++	}
++
++	/*
++	 * Some external monitors do not signal loss of link synchronization
++	 * with an IRQ_HPD, so force a link status check.
++	 */
++	if (!intel_dp_is_edp(intel_dp)) {
+ 		struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
+ 
+ 		intel_dp_retrain_link(encoder, ctx);
diff --git a/configs/fedora/generic/CONFIG_FIXED_PHY b/configs/fedora/generic/CONFIG_FIXED_PHY
index 89309ed1e..80379efd3 100644
--- a/configs/fedora/generic/CONFIG_FIXED_PHY
+++ b/configs/fedora/generic/CONFIG_FIXED_PHY
@@ -1 +1 @@
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
diff --git a/configs/fedora/generic/CONFIG_MDIO_DEVICE b/configs/fedora/generic/CONFIG_MDIO_DEVICE
index 67ac6bad8..07444b0be 100644
--- a/configs/fedora/generic/CONFIG_MDIO_DEVICE
+++ b/configs/fedora/generic/CONFIG_MDIO_DEVICE
@@ -1 +1 @@
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
diff --git a/configs/fedora/generic/CONFIG_PHYLIB b/configs/fedora/generic/CONFIG_PHYLIB
index 9ecd6c079..64ef52233 100644
--- a/configs/fedora/generic/CONFIG_PHYLIB
+++ b/configs/fedora/generic/CONFIG_PHYLIB
@@ -1 +1 @@
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
diff --git a/configs/fedora/generic/arm/CONFIG_OF_MDIO b/configs/fedora/generic/arm/CONFIG_OF_MDIO
index e022a134b..cbdf2ee2f 100644
--- a/configs/fedora/generic/arm/CONFIG_OF_MDIO
+++ b/configs/fedora/generic/arm/CONFIG_OF_MDIO
@@ -1 +1 @@
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
diff --git a/configs/fedora/generic/s390x/CONFIG_MDIO_DEVICE b/configs/fedora/generic/s390x/CONFIG_MDIO_DEVICE
deleted file mode 100644
index 67ac6bad8..000000000
--- a/configs/fedora/generic/s390x/CONFIG_MDIO_DEVICE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_DEVICE=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 5f6b70b3e..4d2189528 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1793,7 +1793,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3141,7 +3141,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_I2C=m
@@ -4162,7 +4162,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4346,7 +4346,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_HISI_INNO_USB2=m
 CONFIG_PHY_HISTB_COMBPHY=m
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ba363d1a4..06f10ec9d 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1775,7 +1775,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3120,7 +3120,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_I2C=m
@@ -4140,7 +4140,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4324,7 +4324,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_HISI_INNO_USB2=m
 CONFIG_PHY_HISTB_COMBPHY=m
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 2500fba3d..7282b31d2 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1906,7 +1906,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3309,7 +3309,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4377,7 +4377,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4602,7 +4602,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index c15e64e25..98e065c24 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1810,7 +1810,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3162,7 +3162,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4192,7 +4192,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4379,7 +4379,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index c6a79f268..30998a611 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1792,7 +1792,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3141,7 +3141,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4170,7 +4170,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4357,7 +4357,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 7f91d92c6..b8f122911 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1888,7 +1888,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3288,7 +3288,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4355,7 +4355,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4580,7 +4580,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 4ab7f1c24..be8bc953c 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1617,7 +1617,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3002,7 +3002,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4161,7 +4161,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index bcf25a2af..eab0c27f6 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1638,7 +1638,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3025,7 +3025,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4184,7 +4184,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 8ce2e36dd..f20b4d8b1 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1638,7 +1638,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3025,7 +3025,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4184,7 +4184,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 1726ed3fb..15d3de125 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1617,7 +1617,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3002,7 +3002,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4161,7 +4161,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index e7ee068f3..5d601f4c5 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1504,7 +1504,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2803,7 +2803,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3905,7 +3905,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 98fe59284..69de57dbd 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1483,7 +1483,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2779,7 +2779,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3880,7 +3880,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index d0c414b44..52a597181 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1489,7 +1489,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2746,7 +2746,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3838,7 +3838,7 @@ CONFIG_PFAULT=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 559002a51..52255d7a8 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1468,7 +1468,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2722,7 +2722,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3813,7 +3813,7 @@ CONFIG_PFAULT=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 18ec046db..3213d034b 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1682,7 +1682,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3077,7 +3077,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4230,7 +4230,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 46c3c0ceb..70df687ac 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1661,7 +1661,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3054,7 +3054,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4207,7 +4207,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel.spec b/kernel.spec
index e23a23ec9..24839312e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -693,6 +693,10 @@ Patch534: 0001-random-make-CPU-trust-a-boot-parameter.patch
 # rhbz 1249364, patch accepted upstream and CCed for stable
 Patch535: ALSA-hda-Add-mic-quirk-for-the-Lenovo-G50-30-17aa-39.patch
 
+# Fix known regression
+Patch536: CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch
+Patch537: CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1955,6 +1959,13 @@ fi
 #
 #
 %changelog
+* Tue Oct 23 2018 Laura Abbott <labbott@redhat.com>
+- Add i915 eDP fixes
+
+* Sat Oct 20 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.18.16-300
+- Linux v4.18.16
+- Fix network on some i.MX6 devices (rhbz 1628209)
+
 * Thu Oct 18 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.18.15-300
 - Linux v4.18.15