aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jani Nikula
2022-10-24 15:33:43 +03:00
parent 2ab6590cd9
commit 66d17ecde7
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gpu/drm/drm_edid.c
View File

@@ -2196,7 +2196,8 @@ static void connector_bad_edid(struct drm_connector *connector,
if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS)) if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))
return; 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++) for (i = 0; i < num_blocks; i++)
edid_block_dump(KERN_DEBUG, edid + i, 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, 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)); 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)) if (version == 1 || version == 2 || (version == 3 && !desktop_usage))
info->non_desktop = true; info->non_desktop = true;
drm_dbg_kms(connector->dev, "HMD or specialized display VSDB version %u: 0x%02x\n", drm_dbg_kms(connector->dev,
version, db[5]); "[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, 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; struct drm_display_info *info = &connector->display_info;
if (block->num_bytes < 3) { if (block->num_bytes < 3) {
drm_dbg_kms(connector->dev, "Unexpected vendor block size %u\n", drm_dbg_kms(connector->dev,
block->num_bytes); "[CONNECTOR:%d:%s] Unexpected vendor block size %u\n",
connector->base.id, connector->name, block->num_bytes);
return; return;
} }
@@ -6262,13 +6266,16 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector,
return; return;
if (sizeof(*vesa) != sizeof(*block) + block->num_bytes) { 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; return;
} }
switch (FIELD_GET(DISPLAYID_VESA_MSO_MODE, vesa->mso)) { switch (FIELD_GET(DISPLAYID_VESA_MSO_MODE, vesa->mso)) {
default: 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; fallthrough;
case 0: case 0:
info->mso_stream_count = 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); info->mso_pixel_overlap = FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->mso);
if (info->mso_pixel_overlap > 8) { 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);
info->mso_pixel_overlap = 8; 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); info->mso_stream_count, info->mso_pixel_overlap);
} }
@@ -6421,7 +6432,8 @@ static u32 update_display_info(struct drm_connector *connector,
out: out:
if (quirks & EDID_QUIRK_NON_DESKTOP) { 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 ? " (redundant quirk)" : "");
info->non_desktop = true; 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; struct drm_edid drm_edid;
if (edid && !drm_edid_is_valid(edid)) { if (edid && !drm_edid_is_valid(edid)) {
drm_warn(connector->dev, "%s: EDID invalid.\n", drm_warn(connector->dev, "[CONNECTOR:%d:%s] EDID invalid.\n",
connector->name); connector->base.id, connector->name);
edid = NULL; edid = NULL;
} }