Commit 66d17ecd authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/edid: add [CONNECTOR:%d:%s] to debug logging 



Reference the connector using [CONNECTOR:%d:%s] in existing device based
debug logging.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarSimon Ser <contact@emersion.fr>
Link: https://patchwork.freedesktop.org/patch/msgid/5884410682bcbc032de4d3af8562c0b271edaa7f.1666614699.git.jani.nikula@intel.com
parent 2ab6590c

drivers/gpu/drm/drm_edid.c

+25 −13
Original line number Diff line number Diff line
@@ -2196,7 +2196,8 @@ static void connector_bad_edid(struct drm_connector *connector, 
	if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))

		return;



	drm_dbg_kms(connector->dev, "%s: EDID is invalid:\n", connector->name);

	drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] EDID is invalid:\n",

		    connector->base.id, connector->name);

	for (i = 0; i < num_blocks; i++)

		edid_block_dump(KERN_DEBUG, edid + i, i);

}
@@ -6031,7 +6032,8 @@ static void drm_parse_hdmi_forum_scds(struct drm_connector *connector, 
	}



	drm_dbg_kms(connector->dev,

		    "HF-VSDB: max TMDS clock: %d KHz, HDMI 2.1 support: %s, DSC 1.2 support: %s\n",

		    "[CONNECTOR:%d:%s] HF-VSDB: max TMDS clock: %d KHz, HDMI 2.1 support: %s, DSC 1.2 support: %s\n",

		    connector->base.id, connector->name,

		    max_tmds_clock, str_yes_no(max_frl_rate), str_yes_no(dsc_support));

}
@@ -6131,8 +6133,9 @@ static void drm_parse_microsoft_vsdb(struct drm_connector *connector, 
	if (version == 1 || version == 2 || (version == 3 && !desktop_usage))

		info->non_desktop = true;



	drm_dbg_kms(connector->dev, "HMD or specialized display VSDB version %u: 0x%02x\n",

		    version, db[5]);

	drm_dbg_kms(connector->dev,

		    "[CONNECTOR:%d:%s] HMD or specialized display VSDB version %u: 0x%02x\n",

		    connector->base.id, connector->name, version, db[5]);

}



static void drm_parse_cea_ext(struct drm_connector *connector,
@@ -6253,8 +6256,9 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector, 
	struct drm_display_info *info = &connector->display_info;



	if (block->num_bytes < 3) {

		drm_dbg_kms(connector->dev, "Unexpected vendor block size %u\n",

			    block->num_bytes);

		drm_dbg_kms(connector->dev,

			    "[CONNECTOR:%d:%s] Unexpected vendor block size %u\n",

			    connector->base.id, connector->name, block->num_bytes);

		return;

	}
@@ -6262,13 +6266,16 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector, 
		return;



	if (sizeof(*vesa) != sizeof(*block) + block->num_bytes) {

		drm_dbg_kms(connector->dev, "Unexpected VESA vendor block size\n");

		drm_dbg_kms(connector->dev,

			    "[CONNECTOR:%d:%s] Unexpected VESA vendor block size\n",

			    connector->base.id, connector->name);

		return;

	}



	switch (FIELD_GET(DISPLAYID_VESA_MSO_MODE, vesa->mso)) {

	default:

		drm_dbg_kms(connector->dev, "Reserved MSO mode value\n");

		drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Reserved MSO mode value\n",

			    connector->base.id, connector->name);

		fallthrough;

	case 0:

		info->mso_stream_count = 0;
@@ -6288,12 +6295,16 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector, 


	info->mso_pixel_overlap = FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->mso);

	if (info->mso_pixel_overlap > 8) {

		drm_dbg_kms(connector->dev, "Reserved MSO pixel overlap value %u\n",

		drm_dbg_kms(connector->dev,

			    "[CONNECTOR:%d:%s] Reserved MSO pixel overlap value %u\n",

			    connector->base.id, connector->name,

			    info->mso_pixel_overlap);

		info->mso_pixel_overlap = 8;

	}



	drm_dbg_kms(connector->dev, "MSO stream count %u, pixel overlap %u\n",

	drm_dbg_kms(connector->dev,

		    "[CONNECTOR:%d:%s] MSO stream count %u, pixel overlap %u\n",

		    connector->base.id, connector->name,

		    info->mso_stream_count, info->mso_pixel_overlap);

}
@@ -6421,7 +6432,8 @@ static u32 update_display_info(struct drm_connector *connector, 


out:

	if (quirks & EDID_QUIRK_NON_DESKTOP) {

		drm_dbg_kms(connector->dev, "Non-desktop display%s\n",

		drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Non-desktop display%s\n",

			    connector->base.id, connector->name,

			    info->non_desktop ? " (redundant quirk)" : "");

		info->non_desktop = true;

	}
@@ -6732,8 +6744,8 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) 
	struct drm_edid drm_edid;



	if (edid && !drm_edid_is_valid(edid)) {

		drm_warn(connector->dev, "%s: EDID invalid.\n",

			 connector->name);

		drm_warn(connector->dev, "[CONNECTOR:%d:%s] EDID invalid.\n",

			 connector->base.id, connector->name);

		edid = NULL;

	}