drm/amd/display: Print type if we get wrong ObjectID from bios

We've seen a bunch of issues where we can't get the connector from vbios
for what we think should be a valid connector id. Print some more info
when this happens.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
index 21fb78e8048d81e4a2371dbba2d3165f5e4da776..c00e405b63e89e8ef93bd23f90fa9596184edc9d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
@@ -190,6 +190,7 @@ static struct graphics_object_id bios_parser_get_connector_id(
        struct bios_parser *bp = BP_FROM_DCB(dcb);
        struct graphics_object_id object_id = dal_graphics_object_id_init(
                0, ENUM_ID_UNKNOWN, OBJECT_TYPE_UNKNOWN);
+       uint16_t id;
 
        uint32_t connector_table_offset = bp->object_info_tbl_offset
                + le16_to_cpu(bp->object_info_tbl.v1_1->usConnectorObjectTableOffset);
@@ -197,12 +198,19 @@ static struct graphics_object_id bios_parser_get_connector_id(
        ATOM_OBJECT_TABLE *tbl =
                GET_IMAGE(ATOM_OBJECT_TABLE, connector_table_offset);
 
-       if (tbl && tbl->ucNumberOfObjects > i) {
-               const uint16_t id = le16_to_cpu(tbl->asObjects[i].usObjectID);
+       if (!tbl) {
+               dm_error("Can't get connector table from atom bios.\n");
+               return object_id;
+       }
 
-               object_id = object_id_from_bios_object_id(id);
+       if (tbl->ucNumberOfObjects <= i) {
+               dm_error("Can't find connector id %d in connector table of size %d.\n",
+                        i, tbl->ucNumberOfObjects);
+               return object_id;
        }
 
+       id = le16_to_cpu(tbl->asObjects[i].usObjectID);
+       object_id = object_id_from_bios_object_id(id);
        return object_id;
 }
 

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 00130152f366e488148febff8da9008ee3cc36c4..da83412af3064f307066243e0c60524bd4f39ede 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -938,8 +938,9 @@ static bool construct(
        link->link_id = bios->funcs->get_connector_id(bios, init_params->connector_index);
 
        if (link->link_id.type != OBJECT_TYPE_CONNECTOR) {
-               dm_error("%s: Invalid Connector ObjectID from Adapter Service for connector index:%d!\n",
-                               __func__, init_params->connector_index);
+               dm_error("%s: Invalid Connector ObjectID from Adapter Service for connector index:%d! type %d expected %d\n",
+                        __func__, init_params->connector_index,
+                        link->link_id.type, OBJECT_TYPE_CONNECTOR);
                goto create_fail;
        }