diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-23 08:44:33 -0800 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-02-25 14:10:55 +1000 |
| commit | c8766ac5933d6ee75e7ce379a1eb5ceb451fcb83 (patch) | |
| tree | 01faa084b8680ed50633bc14a1be64de7d895bf6 /drivers | |
| parent | 37df96736bfe6f5fd9a141d62946e1083d73e712 (diff) | |
| download | talos-obmc-linux-c8766ac5933d6ee75e7ce379a1eb5ceb451fcb83.tar.gz talos-obmc-linux-c8766ac5933d6ee75e7ce379a1eb5ceb451fcb83.zip | |
drm: Fix shifts of EDID vsync offset/width fields.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 5a4d3244758a..e902b1cefc06 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -320,10 +320,10 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev, mode->htotal = mode->hdisplay + ((pt->hblank_hi << 8) | pt->hblank_lo); mode->vdisplay = (pt->vactive_hi << 8) | pt->vactive_lo; - mode->vsync_start = mode->vdisplay + ((pt->vsync_offset_hi << 8) | + mode->vsync_start = mode->vdisplay + ((pt->vsync_offset_hi << 4) | pt->vsync_offset_lo); mode->vsync_end = mode->vsync_start + - ((pt->vsync_pulse_width_hi << 8) | + ((pt->vsync_pulse_width_hi << 4) | pt->vsync_pulse_width_lo); mode->vtotal = mode->vdisplay + ((pt->vblank_hi << 8) | pt->vblank_lo); |
