diff options
| author |   jsg <jsg@openbsd.org> | 2013-04-03 05:57:00 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2013-04-03 05:57:00 +0000 |
| commit | 47940b03f60e44023473a99656729b600beb054e (patch) | |
| tree | 682b9e02252ba590a9a4ca41efa6aa235984bbdb /sys/dev/pci/drm/drm_edid.c | |
| parent | match linux 3.8.5 and backout the 'try to train DP even harder' commit (diff) | |
| download | wireguard-openbsd-47940b03f60e44023473a99656729b600beb054e.tar.xz wireguard-openbsd-47940b03f60e44023473a99656729b600beb054e.zip | |
fix EDID detailed timing vsync parsing
from linux 3.8.5
Diffstat (limited to '')
| -rw-r--r-- | sys/dev/pci/drm/drm_edid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/drm_edid.c b/sys/dev/pci/drm/drm_edid.c index 51d16ca95af..b4b3e79be81 100644 --- a/sys/dev/pci/drm/drm_edid.c +++ b/sys/dev/pci/drm/drm_edid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drm_edid.c,v 1.3 2013/03/30 12:36:50 kettenis Exp $ */ +/* $OpenBSD: drm_edid.c,v 1.4 2013/04/03 05:57:00 jsg Exp $ */ /* * Copyright (c) 2006 Luc Verhaegen (quirks list) * Copyright (c) 2007-2008 Intel Corporation @@ -955,7 +955,7 @@ drm_mode_detailed(struct drm_device *dev, unsigned vblank = (pt->vactive_vblank_hi & 0xf) << 8 | pt->vblank_lo; unsigned hsync_offset = (pt->hsync_vsync_offset_pulse_width_hi & 0xc0) << 2 | pt->hsync_offset_lo; unsigned hsync_pulse_width = (pt->hsync_vsync_offset_pulse_width_hi & 0x30) << 4 | pt->hsync_pulse_width_lo; - unsigned vsync_offset = (pt->hsync_vsync_offset_pulse_width_hi & 0xc) >> 2 | pt->vsync_offset_pulse_width_lo >> 4; + unsigned vsync_offset = (pt->hsync_vsync_offset_pulse_width_hi & 0xc) << 2 | pt->vsync_offset_pulse_width_lo >> 4; unsigned vsync_pulse_width = (pt->hsync_vsync_offset_pulse_width_hi & 0x3) << 4 | (pt->vsync_offset_pulse_width_lo & 0xf); /* ignore tiny modes */ |