leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/dp/mst: fix in MSTB RAD initialization

Browse Source 
This fix is needed to support more then two
branch displays, so RAD address consist at
least of 2 elements

Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Mykola Lysenko <Mykola.Lysenko@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
This commit is contained in:
Mykola Lysenko 2015-12-25 16:14:47 +08:00 committed by Alex Deucher
parent 1f16ee7fa1
commit 75af4c8c4c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/drm_dp_mst_topology.c
View File

@ -978,17 +978,17 @@ static struct drm_dp_mst_port *drm_dp_get_port(struct drm_dp_mst_branch *mstb, u
static u8 drm_dp_calculate_rad(struct drm_dp_mst_port *port, static u8 drm_dp_calculate_rad(struct drm_dp_mst_port *port,
u8 *rad) u8 *rad)
{ {
int lct = port->parent->lct; int parent_lct = port->parent->lct;
int shift = 4; int shift = 4;
int idx = lct / 2; int idx = (parent_lct - 1) / 2;
if (lct > 1) { if (parent_lct > 1) {
memcpy(rad, port->parent->rad, idx); memcpy(rad, port->parent->rad, idx + 1);
shift = (lct % 2) ? 4 : 0; shift = (parent_lct % 2) ? 4 : 0;
} else } else
rad[0] = 0; rad[0] = 0;
rad[idx] |= port->port_num << shift; rad[idx] |= port->port_num << shift;
return lct + 1; return parent_lct + 1;
} }
/* /*