From f14de2e5108ecb126ac763ef9d47cd55689bf012 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 30 Mar 2011 05:03:47 +0000 Subject: [PATCH] --- yaml --- r: 243675 b: refs/heads/master c: eccaca28e29861a63ebc067bfff59c7efa427371 h: refs/heads/master i: 243673: f723f3d6c84dc24b69bfc83ddebde66a8db04418 243671: 8867f92b494b75a45561a3bfe6e62a26314801b4 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_edid.c | 3 ++- trunk/include/drm/drm_crtc.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a481b1226ac6..3f0a4d5fa8c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97ea530f6fac1f9632b0c4792a2a56411454adbe +refs/heads/master: eccaca28e29861a63ebc067bfff59c7efa427371 diff --git a/trunk/drivers/gpu/drm/drm_edid.c b/trunk/drivers/gpu/drm/drm_edid.c index 9c595e3b9c20..adc9358c9bec 100644 --- a/trunk/drivers/gpu/drm/drm_edid.c +++ b/trunk/drivers/gpu/drm/drm_edid.c @@ -1297,7 +1297,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, /** * Search EDID for CEA extension block. */ -static u8 *drm_find_cea_extension(struct edid *edid) +u8 *drm_find_cea_extension(struct edid *edid) { u8 *edid_ext = NULL; int i; @@ -1318,6 +1318,7 @@ static u8 *drm_find_cea_extension(struct edid *edid) return edid_ext; } +EXPORT_SYMBOL(drm_find_cea_extension); /** * drm_detect_hdmi_monitor - detect whether monitor is hdmi. diff --git a/trunk/include/drm/drm_crtc.h b/trunk/include/drm/drm_crtc.h index 60edf9be31e5..aaec09713bee 100644 --- a/trunk/include/drm/drm_crtc.h +++ b/trunk/include/drm/drm_crtc.h @@ -778,6 +778,7 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_mode_gamma_set_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); +extern u8 *drm_find_cea_extension(struct edid *edid); extern bool drm_detect_hdmi_monitor(struct edid *edid); extern bool drm_detect_monitor_audio(struct edid *edid); extern int drm_mode_page_flip_ioctl(struct drm_device *dev,