From e54793ecfc2516ed165c925a2e2325ac371936f3 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 24 Aug 2012 09:42:44 +0300 Subject: [PATCH] --- yaml --- r: 329319 b: refs/heads/master c: f64c48f1d39cbe9e14dd25104633b486b1226606 h: refs/heads/master i: 329317: 1ec47f8397e14220765f579908309a32b1bbc334 329315: 37d93d3bda63ddc4f971b2ddff7afb06a771d36c 329311: 5e0a5fcab30bf47777888b06289f295772679ca3 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b138d98d2e3f..c62f636e75c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce5fdd63752390b89804b1e246de267b398d1515 +refs/heads/master: f64c48f1d39cbe9e14dd25104633b486b1226606 diff --git a/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c b/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c index 9bacce3ce53c..c9abc06ef680 100644 --- a/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c +++ b/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c @@ -1554,7 +1554,6 @@ cdv_intel_dp_detect(struct drm_connector *connector, bool force) edid = drm_get_edid(connector, &intel_dp->adapter); if (edid) { intel_dp->has_audio = drm_detect_monitor_audio(edid); - connector->display_info.raw_edid = NULL; kfree(edid); } } @@ -1634,8 +1633,6 @@ cdv_intel_dp_detect_audio(struct drm_connector *connector) edid = drm_get_edid(connector, &intel_dp->adapter); if (edid) { has_audio = drm_detect_monitor_audio(edid); - - connector->display_info.raw_edid = NULL; kfree(edid); } if (edp)