equal
deleted
inserted
replaced
1 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Mode.c hw/xfree86/common/xf86Mode.c |
1 diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Mode.c hw/xfree86/common/xf86Mode.c |
2 --- hw/xfree86/common/xf86Mode.c 2009-12-02 18:58:15.014804225 -0800 |
2 --- hw/xfree86/common/xf86Mode.c 2010-09-03 16:45:23.099750744 -0700 |
3 +++ hw/xfree86/common/xf86Mode.c 2009-12-02 18:58:16.870675175 -0800 |
3 +++ hw/xfree86/common/xf86Mode.c 2010-09-03 16:45:25.275951707 -0700 |
4 @@ -1397,7 +1397,45 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp |
4 @@ -1563,7 +1563,45 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp |
5 virtX = virtualX; |
5 virtX = virtualX; |
6 virtY = virtualY; |
6 virtY = virtualY; |
7 scrp->virtualFrom = X_CONFIG; |
7 scrp->virtualFrom = X_CONFIG; |
8 - } else if (!modeNames || !*modeNames) { |
8 - } else if (!modeNames || !*modeNames) { |
9 + } |
9 + } |
46 + |
46 + |
47 + if ((virtualY <= 0) && (!modeNames || !*modeNames)) { |
47 + if ((virtualY <= 0) && (!modeNames || !*modeNames)) { |
48 /* No virtual size given in the config, try to infer */ |
48 /* No virtual size given in the config, try to infer */ |
49 /* XXX this doesn't take m{in,ax}Pitch into account; oh well */ |
49 /* XXX this doesn't take m{in,ax}Pitch into account; oh well */ |
50 inferred_virtual = inferVirtualSize(scrp, availModes, &virtX, &virtY); |
50 inferred_virtual = inferVirtualSize(scrp, availModes, &virtX, &virtY); |
51 @@ -1462,12 +1500,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp |
51 @@ -1628,12 +1666,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp |
52 xf86DeleteMode(&scrp->modes, scrp->modes); |
52 xf86DeleteMode(&scrp->modes, scrp->modes); |
53 endp = &scrp->modes; |
53 endp = &scrp->modes; |
54 last = NULL; |
54 last = NULL; |
55 - if (UseDefaultRate && ((modeNames == NULL) || (*modeNames == NULL))) { |
55 - if (UseDefaultRate && ((modeNames == NULL) || (*modeNames == NULL))) { |
56 - modeNames = xnfcalloc(2, sizeof(char *)); |
56 - modeNames = xnfcalloc(2, sizeof(char *)); |