This is a note to let you know that I've just added the patch titled
drm/i915: Pass the correct encoder to intel_ddi_clk_select() with MST
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-pass-the-correct-encoder-to-intel_ddi_clk_select-with-mst.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d919161b67b1ed4a374dae685840a601bbeb1347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@xxxxxxxxxxxxxxx>
Date: Tue, 8 Dec 2015 19:59:36 +0200
Subject: drm/i915: Pass the correct encoder to intel_ddi_clk_select() with MST
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
commit d919161b67b1ed4a374dae685840a601bbeb1347 upstream.
We're supposed to pass the primary DP encoder to intel_ddi_clk_select(),
not the fake MST encoder. Do so.
There's no real bug here though, since intel_ddi_clk_select() only
checks if the encoder type is EDP (which it isn't for either the
primary DP encoder or the fake MST encoder), and it gets the DDI port
via intel_ddi_get_encoder_port() (which knows how to do the
fake->primary->port dance itself).
Fixes: e404ba8 ("drm/i915: Setup DDI clk for MST on SKL")
Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Link: http://patchwork.freedesktop.org/patch/msgid/1449597590-6971-2-git-send-email-ville.syrjala@xxxxxxxxxxxxxxx
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -184,7 +184,7 @@ static void intel_mst_pre_enable_dp(stru
intel_mst->port = found->port;
if (intel_dp->active_mst_links == 0) {
- intel_ddi_clk_select(encoder, intel_crtc->config);
+ intel_ddi_clk_select(&intel_dig_port->base, intel_crtc->config);
intel_dp_set_link_params(intel_dp, intel_crtc->config);
Patches currently in stable-queue which might be from ville.syrjala@xxxxxxxxxxxxxxx are
queue-4.5/drm-i915-use-fw_domains_put_with_fifo-on-hsw.patch
queue-4.5/drm-i915-exit-cherryview_irq_handler-after-one-pass.patch
queue-4.5/drm-i915-skl_update_scaler-wants-a-rotation-bitmask-instead-of-bit-number.patch
queue-4.5/drm-i915-cleanup-phys-status-page-too.patch
queue-4.5/drm-i915-use-the-active-wm-config-for-merging-on-ilk-bdw.patch
queue-4.5/drm-i915-start-wm-computation-from-scratch-on-ilk-bdw.patch
queue-4.5/drm-i915-fix-race-condition-in-intel_dp_destroy_mst_connector.patch
queue-4.5/drm-i915-pass-the-correct-encoder-to-intel_ddi_clk_select-with-mst.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html