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

drm/amd/display: create_links bug with empty DDI slot

Browse Source 
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
Reviewed-by: Hersen Wu <hersenxs.wu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Hersen Wu 2017-05-25 10:55:54 -04:00 committed by Alex Deucher
parent 7fa4fcba7a
commit e4bf0a0eed
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
View File

@ -410,6 +410,9 @@ enum generic_id generic_id_from_bios_object_id(uint32_t bios_object_id)
return id;
}
/* BIOS oject table displaypath is per connector.
* There is extra path not for connector. BIOS fill its encoderid as 0
*/
static uint8_t bios_parser_get_connectors_number(struct dc_bios *dcb)
{
struct bios_parser *bp = BP_FROM_DCB(dcb);
@ -417,9 +420,7 @@ static uint8_t bios_parser_get_connectors_number(struct dc_bios *dcb)
unsigned int i;
for (i = 0; i < bp->object_info_tbl.v1_4->number_of_path; i++) {
if (bp->object_info_tbl.v1_4->display_path[i].encoderobjid != 0
&&
bp->object_info_tbl.v1_4->display_path[i].display_objid != 0)
if (bp->object_info_tbl.v1_4->display_path[i].encoderobjid != 0)
count++;
}
return count;

3
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@ -97,6 +97,7 @@ static bool create_links(
struct core_link *link;
link_init_params.ctx = dc->ctx;
/* next BIOS object table connector */
link_init_params.connector_index = i;
link_init_params.link_index = dc->link_count;
link_init_params.dc = dc;
@ -106,8 +107,6 @@ static bool create_links(
dc->links[dc->link_count] = link;
link->dc = dc;
++dc->link_count;
} else {
dm_error("DC: failed to create link!\n");
}
}