aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_edid.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-08-03 12:22:54 -0400
committerKeith Packard <keithp@keithp.com>2011-08-03 20:43:10 -0400
commitebec9a7bf11f843b0602b06c402f04bf4213b35a (patch)
treedc99677c052f3a24bf55a87f9b88067f3de70102 /drivers/gpu/drm/drm_edid.c
parent4e20fa65a3ea789510eed1a15deb9e8aab2b8202 (diff)
drm: track CEA version number if present
Drivers need to know the CEA version number in addition to other display info (like whether the display is an HDMI sink) before enabling certain features. So track the CEA version number in the display info structure. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
-rw-r--r--drivers/gpu/drm/drm_edid.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 09292193daf..e12f8b0cec9 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1439,6 +1439,8 @@ EXPORT_SYMBOL(drm_detect_monitor_audio);
1439static void drm_add_display_info(struct edid *edid, 1439static void drm_add_display_info(struct edid *edid,
1440 struct drm_display_info *info) 1440 struct drm_display_info *info)
1441{ 1441{
1442 u8 *edid_ext;
1443
1442 info->width_mm = edid->width_cm * 10; 1444 info->width_mm = edid->width_cm * 10;
1443 info->height_mm = edid->height_cm * 10; 1445 info->height_mm = edid->height_cm * 10;
1444 1446
@@ -1483,6 +1485,13 @@ static void drm_add_display_info(struct edid *edid,
1483 info->color_formats = DRM_COLOR_FORMAT_YCRCB444; 1485 info->color_formats = DRM_COLOR_FORMAT_YCRCB444;
1484 if (info->color_formats & DRM_EDID_FEATURE_RGB_YCRCB422) 1486 if (info->color_formats & DRM_EDID_FEATURE_RGB_YCRCB422)
1485 info->color_formats = DRM_COLOR_FORMAT_YCRCB422; 1487 info->color_formats = DRM_COLOR_FORMAT_YCRCB422;
1488
1489 /* Get data from CEA blocks if present */
1490 edid_ext = drm_find_cea_extension(edid);
1491 if (!edid_ext)
1492 return;
1493
1494 info->cea_rev = edid_ext[1];
1486} 1495}
1487 1496
1488/** 1497/**