diff options
| author | Adam Jackson <ajax@redhat.com> | 2010-03-29 21:43:28 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-06 10:40:23 +1000 |
| commit | a0910c8e37c3bede089e9f9dee63a7eaf9601a43 (patch) | |
| tree | 1dd9881958d42631d951be41065567728b359b91 | |
| parent | b17e52ef7e7961f02baec98872781386218558bc (diff) | |
| download | kernel_goldelico_gta04-a0910c8e37c3bede089e9f9dee63a7eaf9601a43.zip kernel_goldelico_gta04-a0910c8e37c3bede089e9f9dee63a7eaf9601a43.tar.gz kernel_goldelico_gta04-a0910c8e37c3bede089e9f9dee63a7eaf9601a43.tar.bz2 | |
drm/edid: Fix the HDTV hack.
Standard timings don't let you say 1366. Both 1360 and 1368 have been
seen in the wild. So invent a CVT timing for it. CVT will round 1366 up
to 1368; we'll then manually underscan it.
Split this into two parts, since we need to do something sneaky between
them in the future.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index e746dd5..d721438 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -765,15 +765,25 @@ struct drm_display_mode *drm_mode_std(struct drm_device *dev, vsize = (hsize * 4) / 5; else vsize = (hsize * 9) / 16; - /* HDTV hack */ - if (hsize == 1360 && vsize == 765 && vrefresh_rate == 60) { - mode = drm_cvt_mode(dev, hsize, vsize, vrefresh_rate, 0, 0, + + /* HDTV hack, part 1 */ + if (vrefresh_rate == 60 && + ((hsize == 1360 && vsize == 765) || + (hsize == 1368 && vsize == 769))) { + hsize = 1366; + vsize = 768; + } + + /* HDTV hack, part 2 */ + if (hsize == 1366 && vsize == 768 && vrefresh_rate == 60) { + mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0, false); mode->hdisplay = 1366; mode->vsync_start = mode->vsync_start - 1; mode->vsync_end = mode->vsync_end - 1; return mode; } + mode = NULL; /* check whether it can be found in default mode table */ mode = drm_find_dmt(dev, hsize, vsize, vrefresh_rate); |