From c74d954561d63eada2b4974a6c437b7e150f6f9b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 29 Mar 2010 21:43:25 +0000 Subject: [PATCH] --- yaml --- r: 196431 b: refs/heads/master c: a327f6b806103ee177aba20bb1e42ba7ec7d0f4b h: refs/heads/master i: 196429: dc2754c19ee70f3fd8143c57555c31ee7f18e120 196427: 140bc79170204ae829a69529bf02e8f9352dbb65 196423: c6ec65c05c795347ed9846a45936ff5702dabf21 196415: 0af11be8345ae9d1c1c6391082396f049d3f24f6 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_edid.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c206fde1f30..74c78ea8f8a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59d8aff6e4fc2705053e7ce2948b51f7fe507536 +refs/heads/master: a327f6b806103ee177aba20bb1e42ba7ec7d0f4b diff --git a/trunk/drivers/gpu/drm/drm_edid.c b/trunk/drivers/gpu/drm/drm_edid.c index 9aa65b289d01..2e1298cf576f 100644 --- a/trunk/drivers/gpu/drm/drm_edid.c +++ b/trunk/drivers/gpu/drm/drm_edid.c @@ -1295,7 +1295,10 @@ static int add_detailed_info(struct drm_connector *connector, for (i = 0; i < EDID_DETAILED_TIMINGS; i++) { struct detailed_timing *timing = &edid->detailed_timings[i]; - int preferred = (i == 0) && (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING); + int preferred = (i == 0); + + if (preferred && edid->version == 1 && edid->revision < 4) + preferred = (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING); /* In 1.0, only timings are allowed */ if (!timing->pixel_clock && edid->version == 1 &&