1 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.

     2 # Use subject to license terms.

     3 #

     4 # Permission is hereby granted, free of charge, to any person obtaining a

     5 # copy of this software and associated documentation files (the

     6 # "Software"), to deal in the Software without restriction, including

     7 # without limitation the rights to use, copy, modify, merge, publish,

     8 # distribute, and/or sell copies of the Software, and to permit persons

     9 # to whom the Software is furnished to do so, provided that the above

    10 # copyright notice(s) and this permission notice appear in all copies of

    11 # the Software and that both the above copyright notice(s) and this

    12 # permission notice appear in supporting documentation.

    13 # 

    14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

    15 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

    16 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

    17 # OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

    18 # HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

    19 # INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

    20 # FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

    21 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

    22 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

    23 # 

    24 # Except as contained in this notice, the name of a copyright holder

    25 # shall not be used in advertising or otherwise to promote the sale, use

    26 # or other dealings in this Software without prior written authorization

    27 # of the copyright holder.

    28 

    29 6370961  - needs sane vert, horiz ranges

    30 

    31 diff -urp -x '*~' src/vmware.c src/vmware.c

    32 --- src/vmware.c	2006-10-31 19:12:05.000000000 -0800

    33 +++ src/vmware.c	2006-11-01 11:10:40.076805000 -0800

    34 @@ -924,6 +924,20 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla

    35      clockRanges->ClockMulFactor = 1;

    36      clockRanges->ClockDivFactor = 1;

    37  

    38 +    /* Set reasonable default Hsync range, if needed. */

    39 +    if (pScrn->monitor->nHsync == 0) {

    40 +        pScrn->monitor->hsync[0].lo = 31.5f;

    41 +        pScrn->monitor->hsync[0].hi = 64.0f;

    42 +        pScrn->monitor->nHsync = 1;

    43 +    }

    44 +

    45 +    /* Set reasonable default Vsync range, if needed. */

    46 +    if (pScrn->monitor->nVrefresh == 0) {

    47 +        pScrn->monitor->vrefresh[0].lo = 50.0f;

    48 +        pScrn->monitor->vrefresh[0].hi = 70.0f;

    49 +        pScrn->monitor->nVrefresh = 1;

    50 +    }

    51 +

    52      i = xf86ValidateModes(pScrn, pScrn->monitor->Modes, pScrn->display->modes,

    53                            clockRanges, NULL, 256, pVMWARE->maxWidth, 32 * 32,

    54                            128, pVMWARE->maxHeight,