Commit e4bf0a0e authored by Hersen Wu's avatar Hersen Wu Committed by Alex Deucher

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

Signed-off-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Reviewed-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7fa4fcba
...@@ -410,6 +410,9 @@ enum generic_id generic_id_from_bios_object_id(uint32_t bios_object_id) ...@@ -410,6 +410,9 @@ enum generic_id generic_id_from_bios_object_id(uint32_t bios_object_id)
return 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) static uint8_t bios_parser_get_connectors_number(struct dc_bios *dcb)
{ {
struct bios_parser *bp = BP_FROM_DCB(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) ...@@ -417,9 +420,7 @@ static uint8_t bios_parser_get_connectors_number(struct dc_bios *dcb)
unsigned int i; unsigned int i;
for (i = 0; i < bp->object_info_tbl.v1_4->number_of_path; 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 if (bp->object_info_tbl.v1_4->display_path[i].encoderobjid != 0)
&&
bp->object_info_tbl.v1_4->display_path[i].display_objid != 0)
count++; count++;
} }
return count; return count;
......
...@@ -97,6 +97,7 @@ static bool create_links( ...@@ -97,6 +97,7 @@ static bool create_links(
struct core_link *link; struct core_link *link;
link_init_params.ctx = dc->ctx; link_init_params.ctx = dc->ctx;
/* next BIOS object table connector */
link_init_params.connector_index = i; link_init_params.connector_index = i;
link_init_params.link_index = dc->link_count; link_init_params.link_index = dc->link_count;
link_init_params.dc = dc; link_init_params.dc = dc;
...@@ -106,8 +107,6 @@ static bool create_links( ...@@ -106,8 +107,6 @@ static bool create_links(
dc->links[dc->link_count] = link; dc->links[dc->link_count] = link;
link->dc = dc; link->dc = dc;
++dc->link_count; ++dc->link_count;
} else {
dm_error("DC: failed to create link!\n");
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment