Skip to content

Commit

Permalink
drm/edid: Fix preferred mode parse for EDID 1.4
Browse files Browse the repository at this point in the history
In 1.4, the first detailed mode is always the preferred mode.  The bit
that used to mean that, now means "this mode is the physical size in
pixels".

Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Adam Jackson authored and Dave Airlie committed Apr 6, 2010
1 parent 59d8aff commit a327f6b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/gpu/drm/drm_edid.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit a327f6b

Please sign in to comment.