From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail177-1.suw61.mandrillapp.com ([198.2.177.1]:9173 "EHLO mail177-1.suw61.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753167AbcCATuQ (ORCPT ); Tue, 1 Mar 2016 14:50:16 -0500 Received: from pmta06.mandrill.prod.suw01.rsglab.com (127.0.0.1) by mail177-1.suw61.mandrillapp.com id hqnp7g22rtk0 for ; Tue, 1 Mar 2016 19:50:05 +0000 (envelope-from ) From: Subject: Patch "drm/dp/mst: fix in MSTB RAD initialization" has been added to the 4.4-stable tree To: , , , Cc: , Message-Id: <1456861799113186@kroah.com> Date: Tue, 01 Mar 2016 19:50:05 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled drm/dp/mst: fix in MSTB RAD initialization to the 4.4-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-dp-mst-fix-in-mstb-rad-initialization.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 75af4c8c4c0f60d7ad135419805798f144e9baf9 Mon Sep 17 00:00:00 2001 From: Mykola Lysenko Date: Fri, 25 Dec 2015 16:14:47 +0800 Subject: drm/dp/mst: fix in MSTB RAD initialization From: Mykola Lysenko commit 75af4c8c4c0f60d7ad135419805798f144e9baf9 upstream. This fix is needed to support more then two branch displays, so RAD address consist at least of 2 elements Acked-by: Dave Airlie Signed-off-by: Mykola Lysenko Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_dp_mst_topology.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -973,17 +973,17 @@ static struct drm_dp_mst_port *drm_dp_ge static u8 drm_dp_calculate_rad(struct drm_dp_mst_port *port, u8 *rad) { - int lct = port->parent->lct; + int parent_lct = port->parent->lct; int shift = 4; - int idx = lct / 2; - if (lct > 1) { - memcpy(rad, port->parent->rad, idx); - shift = (lct % 2) ? 4 : 0; + int idx = (parent_lct - 1) / 2; + if (parent_lct > 1) { + memcpy(rad, port->parent->rad, idx + 1); + shift = (parent_lct % 2) ? 4 : 0; } else rad[0] = 0; rad[idx] |= port->port_num << shift; - return lct + 1; + return parent_lct + 1; } /* Patches currently in stable-queue which might be from Mykola.Lysenko@amd.com are queue-4.4/drm-dp-mst-deallocate-payload-on-port-destruction.patch queue-4.4/drm-dp-mst-process-broadcast-messages-correctly.patch queue-4.4/drm-dp-mst-fix-in-rad-element-access.patch queue-4.4/drm-dp-mst-always-send-reply-for-up-request.patch queue-4.4/drm-dp-mst-fix-in-mstb-rad-initialization.patch