Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 21:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm: edid: Refactor HDMI VSDB detection

Browse Source 
There are two slightly different pieces of code for HDMI VSDB
detection. Unify the code into a single helper function.

Also fix a bug where drm_detect_hdmi_monitor() would stop looking
for the HDMI VSDB after the first vendor specific block is found,
whether or not that block happened to be the HDMI VSDB. The
standard allows for any number of vendor specific blocks to be
present.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Ville Syrjälä 2012-08-16 14:55:06 +00:00 committed by Dave Airlie
parent 8504072a2a
commit 14f77fdd58
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1621,6 +1621,21 @@ monitor_name(struct detailed_timing *t, void *data)
*(u8 **)data = t->data.other_data.data.str.str; *(u8 **)data = t->data.other_data.data.str.str;
} }
static bool cea_db_is_hdmi_vsdb(const u8 *db)
{
int hdmi_id;
if (cea_db_tag(db) != VENDOR_BLOCK)
return false;
if (cea_db_payload_len(db) < 5)
return false;
hdmi_id = db[1] | (db[2] << 8) | (db[3] << 16);
return hdmi_id == HDMI_IDENTIFIER;
}
/** /**
* drm_edid_to_eld - build ELD from EDID * drm_edid_to_eld - build ELD from EDID
* @connector: connector corresponding to the HDMI/DP sink * @connector: connector corresponding to the HDMI/DP sink
@ -1693,7 +1708,7 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
break; break;
case VENDOR_BLOCK: case VENDOR_BLOCK:
/* HDMI Vendor-Specific Data Block */ /* HDMI Vendor-Specific Data Block */
if (dbl >= 5 && db[1] == 0x03 && db[2] == 0x0c && db[3] == 0) if (cea_db_is_hdmi_vsdb(db))
parse_hdmi_vsdb(connector, db); parse_hdmi_vsdb(connector, db);
break; break;
default: default:
@ -1778,35 +1793,26 @@ EXPORT_SYMBOL(drm_select_eld);
bool drm_detect_hdmi_monitor(struct edid *edid) bool drm_detect_hdmi_monitor(struct edid *edid)
{ {
u8 *edid_ext; u8 *edid_ext;
int i, hdmi_id; int i;
int start_offset, end_offset; int start_offset, end_offset;
bool is_hdmi = false;
edid_ext = drm_find_cea_extension(edid); edid_ext = drm_find_cea_extension(edid);
if (!edid_ext) if (!edid_ext)
goto end; return false;
if (cea_db_offsets(edid_ext, &start_offset, &end_offset)) if (cea_db_offsets(edid_ext, &start_offset, &end_offset))
goto end; return false;
/* /*
* Because HDMI identifier is in Vendor Specific Block, * Because HDMI identifier is in Vendor Specific Block,
* search it from all data blocks of CEA extension. * search it from all data blocks of CEA extension.
*/ */
for_each_cea_db(edid_ext, i, start_offset, end_offset) { for_each_cea_db(edid_ext, i, start_offset, end_offset) {
/* Find vendor specific block */ if (cea_db_is_hdmi_vsdb(&edid_ext[i]))
if (cea_db_tag(&edid_ext[i]) == VENDOR_BLOCK) { return true;
hdmi_id = edid_ext[i + 1] | (edid_ext[i + 2] << 8) |
edid_ext[i + 3] << 16;
/* Find HDMI identifier */
if (hdmi_id == HDMI_IDENTIFIER)
is_hdmi = true;
break;
}
} }
end: return false;
return is_hdmi;
} }
EXPORT_SYMBOL(drm_detect_hdmi_monitor); EXPORT_SYMBOL(drm_detect_hdmi_monitor);