FAILED: patch "[PATCH] drm/i915/bxt: Add MST support when do DPLL calculation" failed to apply to 4.11-stable tree

The patch below does not apply to the 4.11-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From: "Lee, Shawn C" <[email protected]>
Date: Fri, 3 Feb 2017 12:32:09 +0800
Subject: [PATCH] drm/i915/bxt: Add MST support when do DPLL calculation

Add the missing INTEL_OUTPUT_DP_MST case in bxt_get_dpll() to correctly initialize the crtc_state and port plls when link training a DP MST monitor on BXT/APL devices.

Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=99572

index 368eff93a0a6..79f656ca593d 100644
@@ -1855,7 +1855,8 @@ bxt_get_dpll(struct intel_crtc *crtc,
 		return NULL;
 
 	if ((encoder->type == INTEL_OUTPUT_DP ||
-	     encoder->type == INTEL_OUTPUT_EDP) &&
+	     encoder->type == INTEL_OUTPUT_EDP ||
+	     encoder->type == INTEL_OUTPUT_DP_MST) &&
 	    !bxt_ddi_dp_set_dpll_hw_state(clock, &dpll_hw_state))
 		return NULL;
 

This patch is already there as 789ea12500e5c, part of v4.10

(789ea12500e5c is a cherry-pick from a commit which landed in v4.12-rc1)

Marc

On 12/06/2017, 05:25, "[email protected]" <[email protected]> wrote:

    The patch below does not apply to the 4.11-stable tree.
    If someone wants it applied there, or to any other stable or longterm
    tree, then please email the backport, including the original git commit
    id to <[email protected]>.
    
    thanks,
    
    greg k-h
    
    ------------------ original commit in Linus's tree ------------------
    
    From 0aab2c721d81590012a5021a516f00666646741f Mon Sep 17 00:00:00 2001
    From: "Lee, Shawn C" <[email protected]>
    Date: Fri, 3 Feb 2017 12:32:09 +0800
    Subject: [PATCH] drm/i915/bxt: Add MST support when do DPLL calculation
    
    Add the missing INTEL_OUTPUT_DP_MST case in bxt_get_dpll()
    to correctly initialize the crtc_state and port plls when
    link training a DP MST monitor on BXT/APL devices.
    
    Fixes: a277ca7dc01d ("drm/i915: Split bxt_ddi_pll_select()")
    Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=99572
    Reviewed-by: Cooper Chiou <[email protected]>
    Reviewed-by: Gary C Wang <[email protected]>
    Reviewed-by: Ciobanu, Nathan D <[email protected]>
    Reviewed-by: Herbert, Marc <[email protected]>
    Reviewed-by: Bride, Jim <[email protected]>
    Reviewed-by: Navare, Manasi D <[email protected]>
    Cc: Jani Nikula <[email protected]>
    Cc: <[email protected]> # v4.9+
    Signed-off-by: Lee, Shawn C <[email protected]>
    Signed-off-by: Jani Nikula <[email protected]>
    Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
    
    diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
    index 368eff93a0a6..79f656ca593d 100644
    --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
    +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
    @@ -1855,7 +1855,8 @@ bxt_get_dpll(struct intel_crtc *crtc,
     		return NULL;
     
     	if ((encoder->type == INTEL_OUTPUT_DP ||
    -	     encoder->type == INTEL_OUTPUT_EDP) &&
    +	     encoder->type == INTEL_OUTPUT_EDP ||
    +	     encoder->type == INTEL_OUTPUT_DP_MST) &&
     	    !bxt_ddi_dp_set_dpll_hw_state(clock, &dpll_hw_state))
     		return NULL;