Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63b371ec authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

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: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0cadc865

drivers/gpu/drm/amd/display/dc/bios/bios_parser.c

+11 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

	}