Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
Link: https://patchwork.freedesktop.org/patch/msgid/5884410682bcbc032de4d3af8562c0b271edaa7f.1666614699.git.jani.nikula@intel.com

+25 -13
+25 -13
drivers/gpu/drm/drm_edid.c
··· 2196 2196 if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS)) 2197 2197 return; 2198 2198 2199 - drm_dbg_kms(connector->dev, "%s: EDID is invalid:\n", connector->name); 2199 + drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] EDID is invalid:\n", 2200 + connector->base.id, connector->name); 2200 2201 for (i = 0; i < num_blocks; i++) 2201 2202 edid_block_dump(KERN_DEBUG, edid + i, i); 2202 2203 } ··· 6032 6031 } 6033 6032 6034 6033 drm_dbg_kms(connector->dev, 6035 - "HF-VSDB: max TMDS clock: %d KHz, HDMI 2.1 support: %s, DSC 1.2 support: %s\n", 6034 + "[CONNECTOR:%d:%s] HF-VSDB: max TMDS clock: %d KHz, HDMI 2.1 support: %s, DSC 1.2 support: %s\n", 6035 + connector->base.id, connector->name, 6036 6036 max_tmds_clock, str_yes_no(max_frl_rate), str_yes_no(dsc_support)); 6037 6037 } 6038 6038 ··· 6133 6131 if (version == 1 || version == 2 || (version == 3 && !desktop_usage)) 6134 6132 info->non_desktop = true; 6135 6133 6136 - drm_dbg_kms(connector->dev, "HMD or specialized display VSDB version %u: 0x%02x\n", 6137 - version, db[5]); 6134 + drm_dbg_kms(connector->dev, 6135 + "[CONNECTOR:%d:%s] HMD or specialized display VSDB version %u: 0x%02x\n", 6136 + connector->base.id, connector->name, version, db[5]); 6138 6137 } 6139 6138 6140 6139 static void drm_parse_cea_ext(struct drm_connector *connector, ··· 6256 6253 struct drm_display_info *info = &connector->display_info; 6257 6254 6258 6255 if (block->num_bytes < 3) { 6259 - drm_dbg_kms(connector->dev, "Unexpected vendor block size %u\n", 6260 - block->num_bytes); 6256 + drm_dbg_kms(connector->dev, 6257 + "[CONNECTOR:%d:%s] Unexpected vendor block size %u\n", 6258 + connector->base.id, connector->name, block->num_bytes); 6261 6259 return; 6262 6260 } 6263 6261 ··· 6266 6262 return; 6267 6263 6268 6264 if (sizeof(*vesa) != sizeof(*block) + block->num_bytes) { 6269 - drm_dbg_kms(connector->dev, "Unexpected VESA vendor block size\n"); 6265 + drm_dbg_kms(connector->dev, 6266 + "[CONNECTOR:%d:%s] Unexpected VESA vendor block size\n", 6267 + connector->base.id, connector->name); 6270 6268 return; 6271 6269 } 6272 6270 6273 6271 switch (FIELD_GET(DISPLAYID_VESA_MSO_MODE, vesa->mso)) { 6274 6272 default: 6275 - drm_dbg_kms(connector->dev, "Reserved MSO mode value\n"); 6273 + drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Reserved MSO mode value\n", 6274 + connector->base.id, connector->name); 6276 6275 fallthrough; 6277 6276 case 0: 6278 6277 info->mso_stream_count = 0; ··· 6295 6288 6296 6289 info->mso_pixel_overlap = FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->mso); 6297 6290 if (info->mso_pixel_overlap > 8) { 6298 - drm_dbg_kms(connector->dev, "Reserved MSO pixel overlap value %u\n", 6291 + drm_dbg_kms(connector->dev, 6292 + "[CONNECTOR:%d:%s] Reserved MSO pixel overlap value %u\n", 6293 + connector->base.id, connector->name, 6299 6294 info->mso_pixel_overlap); 6300 6295 info->mso_pixel_overlap = 8; 6301 6296 } 6302 6297 6303 - drm_dbg_kms(connector->dev, "MSO stream count %u, pixel overlap %u\n", 6298 + drm_dbg_kms(connector->dev, 6299 + "[CONNECTOR:%d:%s] MSO stream count %u, pixel overlap %u\n", 6300 + connector->base.id, connector->name, 6304 6301 info->mso_stream_count, info->mso_pixel_overlap); 6305 6302 } 6306 6303 ··· 6432 6421 6433 6422 out: 6434 6423 if (quirks & EDID_QUIRK_NON_DESKTOP) { 6435 - drm_dbg_kms(connector->dev, "Non-desktop display%s\n", 6424 + drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Non-desktop display%s\n", 6425 + connector->base.id, connector->name, 6436 6426 info->non_desktop ? " (redundant quirk)" : ""); 6437 6427 info->non_desktop = true; 6438 6428 } ··· 6744 6732 struct drm_edid drm_edid; 6745 6733 6746 6734 if (edid && !drm_edid_is_valid(edid)) { 6747 - drm_warn(connector->dev, "%s: EDID invalid.\n", 6748 - connector->name); 6735 + drm_warn(connector->dev, "[CONNECTOR:%d:%s] EDID invalid.\n", 6736 + connector->base.id, connector->name); 6749 6737 edid = NULL; 6750 6738 } 6751 6739