From d5b63198518596e8416a83881ec14dd6a76345d6 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 9 Apr 2018 10:13:11 -0700 Subject: Linux v4.15.16 --- ...rite-to-SET_POWER-dpcd-to-enable-MST-hub..patch | 65 ---------------------- kernel.spec | 8 +-- sources | 2 +- 3 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 drm-i915-dp-Write-to-SET_POWER-dpcd-to-enable-MST-hub..patch 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 -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ä -Cc: Jani Nikula -Signed-off-by: Dhinakaran Pandiyan -Reviewed-by: Ville Syrjälä ---- - 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 e023f4940..e44ad93a5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 15 +%define stable_update 16 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -638,9 +638,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 @@ -1948,6 +1945,9 @@ fi # # %changelog +* Mon Apr 09 2018 Laura Abbott - 4.15.16-200 +- Linux v4.15.16 + * Mon Apr 02 2018 Laura Abbott - 4.15.15-200 - Linux v4.15.15 diff --git a/sources b/sources index e4ffc2754..99007d1a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea -SHA512 (patch-4.15.15.xz) = 4f3da42c3540b621706b74477e1e1922f5fca295d38e57f323f53a005d6aa8d247f30e19440af052d832ee19f298d108d1f8fc8a0a7d1a7c05470b32d8af07b3 +SHA512 (patch-4.15.16.xz) = 62776fb409050c77c08394129c0978dbe8832e124ab435570cb083167226b3bf1771c68f18aa25cd69ad9038a22a1472adce02825b97f1c718bf161d8856afa3 -- cgit