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

2 files changed, 3 insertions, 68 deletions

diff --git a/drm-i915-dp-Write-to-SET_POWER-dpcd-to-enable-MST-hub..patch b/drm-i915-dp-Write-to-SET_POWER-dpcd-to-enable-MST-hub..patch
deleted file mode 100644
index b1c434074..000000000
--- a/drm-i915-dp-Write-to-SET_POWER-dpcd-to-enable-MST-hub..patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From ddc1b88d9947a548cc9a41b421df2941483b1e04 Mon Sep 17 00:00:00 2001
-From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-Date: Tue, 13 Mar 2018 22:48:25 -0700
-Subject: [PATCH] drm/i915/dp: Write to SET_POWER dpcd to enable MST hub.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If bios sets up an MST output and hardware state readout code sees this is
-an SST configuration, when disabling the encoder we end up calling
-->post_disable_dp() hook instead of the MST version. Consequently, we write
-to the DP_SET_POWER dpcd to set it D3 state. Further along when we try
-enable the encoder in MST mode, POWER_UP_PHY transaction fails to power up
-the MST hub. This results in continuous link training failures which keep
-the system busy delaying boot. We could identify bios MST boot discrepancy
-and handle it accordingly but a simple way to solve this is to write to the
-DP_SET_POWER dpcd for MST too.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105470
-Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Cc: Jani Nikula <jani.nikula@intel.com>
-Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
----
- drivers/gpu/drm/i915/intel_ddi.c | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
-index 58a3755544b2..38e53d6b8127 100644
---- a/drivers/gpu/drm/i915/intel_ddi.c
-+++ b/drivers/gpu/drm/i915/intel_ddi.c
-@@ -2208,8 +2208,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
- 		intel_prepare_dp_ddi_buffers(encoder);
- 
- 	intel_ddi_init_dp_buf_reg(encoder);
--	if (!is_mst)
--		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
-+	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
- 	intel_dp_start_link_train(intel_dp);
- 	if (port != PORT_A || INTEL_GEN(dev_priv) >= 9)
- 		intel_dp_stop_link_train(intel_dp);
-@@ -2294,19 +2293,12 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,
- 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
- 	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
- 	struct intel_dp *intel_dp = &dig_port->dp;
--	/*
--	 * old_crtc_state and old_conn_state are NULL when called from
--	 * DP_MST. The main connector associated with this port is never
--	 * bound to a crtc for MST.
--	 */
--	bool is_mst = !old_crtc_state;
- 
- 	/*
- 	 * Power down sink before disabling the port, otherwise we end
- 	 * up getting interrupts from the sink on detecting link loss.
- 	 */
--	if (!is_mst)
--		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
-+	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
- 
- 	intel_disable_ddi_buf(encoder);
- 
--- 
-2.14.3
-
diff --git a/kernel.spec b/kernel.spec
index 12e7d9264..f6fe71893 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -655,9 +655,6 @@ Patch658: 0001-scsi-libsas-fix-memory-leak-in-sas_smp_get_phy_event.patch
 # CVE-2018-8043 rhbz 1554199 1554200
 Patch660: 0001-net-phy-mdio-bcm-unimac-fix-potential-NULL-dereferen.patch
 
-# rhbz 1549042
-Patch661: drm-i915-dp-Write-to-SET_POWER-dpcd-to-enable-MST-hub..patch
-
 # CVE-2017-18232 rhbz 1558066 1558067
 Patch663: 0001-scsi-libsas-direct-call-probe-and-destruct.patch
 
@@ -1968,6 +1965,9 @@ fi
 #
 #
 %changelog
+* Mon Apr 09 2018 Laura Abbott <labbott@redhat.com> - 4.15.16-200
+- Linux v4.15.16
+
 * Mon Apr 02 2018 Laura Abbott <labbott@redhat.com> - 4.15.15-200
 - Linux v4.15.15