drm/amd/display: Display object info table changes

[Why]
display_object_info_table_v1_5 with atom_display_object_path_v3
will be used.

[How]
Add bios parser support for display_object_info_table_v1_5 with
atom_display_object_path_v3 for all existing, in use bios records
as well as for new records:
ATOM_CONNECTOR_CAP_RECORD_TYPE,
ATOM_CONNECTOR_SPEED_UPTO and
ATOM_BRACKET_LAYOUT_V2_RECORD_TYPE.

Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Nevenko Stupar <Nevenko.Stupar@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 a4bef4364afd8d65688ba400c3c84a0aa6d683c6..1e385d55e7fbba5f0fe80f471518faa2aafbaa74 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
@@ -2995,7 +2995,7 @@ static bool bios_parser2_construct(
                &bp->object_info_tbl.revision);
 
        if (bp->object_info_tbl.revision.major == 1
-               && bp->object_info_tbl.revision.minor >= 4) {
+               && bp->object_info_tbl.revision.minor == 4) {
                struct display_object_info_table_v1_4 *tbl_v1_4;
 
                tbl_v1_4 = GET_IMAGE(struct display_object_info_table_v1_4,
@@ -3004,8 +3004,10 @@ static bool bios_parser2_construct(
                        return false;
 
                bp->object_info_tbl.v1_4 = tbl_v1_4;
-       } else
+       } else {
+               ASSERT(0);
                return false;
+       }
 
        dal_firmware_parser_init_cmd_tbl(bp);
        dal_bios_parser_init_cmd_tbl_helper2(&bp->cmd_helper, dce_version);