diff options
| author | Hersen Wu <hersenxs.wu@amd.com> | 2017-05-25 10:55:54 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:07:38 -0400 |
| commit | e4bf0a0eed7e0e3bb7f0be2788cf0a5ecc16b068 (patch) | |
| tree | 39d66dd39a61e4ae2cbe36ed869edd4a6a1d27fa /drivers/gpu | |
| parent | 7fa4fcba7ab4f29f88b503e0e840f4c3bf774dc0 (diff) | |
| download | linux-e4bf0a0eed7e0e3bb7f0be2788cf0a5ecc16b068.tar.bz2 | |
drm/amd/display: create_links bug with empty DDI slot
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c index 682fc9b9b3f2..fcd3b72287c8 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c @@ -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; diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index c33e31c9e3e1..323a5e706908 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -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"); } } |