diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-07 07:22:24 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-07 07:22:24 +0100 |
| commit | af3f3672e5f77a06a24b1e648ee118f1420b45ae (patch) | |
| tree | 2f08e1da8d47d44fcbf78f660ee8d99bf162b5f2 /xorg-server/hw/xfree86/vbe | |
| parent | 60f8ca2d5842b40b8585c58095787c84edfa9803 (diff) | |
| parent | 1ed503a856d9753a813951796bc6ba56c42ecd28 (diff) | |
| download | vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.gz vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.bz2 vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'xorg-server/hw/xfree86/vbe')
| -rw-r--r-- | xorg-server/hw/xfree86/vbe/vbe.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/vbe/vbe.c b/xorg-server/hw/xfree86/vbe/vbe.c index 04132d956..06a628457 100644 --- a/xorg-server/hw/xfree86/vbe/vbe.c +++ b/xorg-server/hw/xfree86/vbe/vbe.c @@ -1036,13 +1036,16 @@ VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data) mode = xf86CVTMode(data->hsize, data->vsize, PANEL_HZ, 1, 0); pScrn->monitor->nHsync = 1; - pScrn->monitor->hsync[0].lo = 31.5; + pScrn->monitor->hsync[0].lo = 29.37; pScrn->monitor->hsync[0].hi = (float)mode->Clock / (float)mode->HTotal; pScrn->monitor->nVrefresh = 1; pScrn->monitor->vrefresh[0].lo = 56.0; pScrn->monitor->vrefresh[0].hi = (float)mode->Clock*1000.0 / (float)mode->HTotal / (float)mode->VTotal; + if (pScrn->monitor->vrefresh[0].hi < 59.47) + pScrn->monitor->vrefresh[0].hi = 59.47; + free(mode); } |