linux-kernel - [PATCH 4.9 23/60] drm/i915/bxt: Add MST support when do DPLL calculation

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20170213130336.315328452@linuxfoundation.org>
Date:   Mon, 13 Feb 2017 05:03:55 -0800
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel@...r.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        stable@...r.kernel.org, Cooper Chiou <cooper.chiou@...el.com>,
        Gary C Wang <gary.c.wang@...el.com>,
        "Ciobanu, Nathan D" <nathan.d.ciobanu@...el.com>,
        "Herbert, Marc" <marc.herbert@...el.com>,
        "Bride, Jim" <jim.bride@...el.com>,
        "Navare, Manasi D" <manasi.d.navare@...el.com>,
        Jani Nikula <jani.nikula@...el.com>,
        "Lee, Shawn C" <shawn.c.lee@...el.com>
Subject: [PATCH 4.9 23/60] drm/i915/bxt: Add MST support when do DPLL calculation

4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Lee, Shawn C <shawn.c.lee@...el.com>

commit 789ea12500e5ce3911d0a6a822277c3133451927 upstream.

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 <cooper.chiou@...el.com>
Reviewed-by: Gary C Wang <gary.c.wang@...el.com>
Reviewed-by: Ciobanu, Nathan D <nathan.d.ciobanu@...el.com>
Reviewed-by: Herbert, Marc <marc.herbert@...el.com>
Reviewed-by: Bride, Jim <jim.bride@...el.com>
Reviewed-by: Navare, Manasi D <manasi.d.navare@...el.com>
Cc: Jani Nikula <jani.nikula@...el.com>
Signed-off-by: Lee, Shawn C <shawn.c.lee@...el.com>
Signed-off-by: Jani Nikula <jani.nikula@...el.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1486096329-6255-1-git-send-email-shawn.c.lee@intel.com
(cherry picked from commit 0aab2c721d81590012a5021a516f00666646741f)
Signed-off-by: Jani Nikula <jani.nikula@...el.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>

---
 drivers/gpu/drm/i915/intel_dpll_mgr.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -1723,7 +1723,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;