diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-20 08:18:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-20 08:18:11 +0200 |
| commit | 06d4ea68085558b94d8e9c937091e7b7fcc5d95a (patch) | |
| tree | 01ff2f6a8d6ae430a526282d98eede21c7cfffd0 /xorg-server/hw/xfree86/modes | |
| parent | 52213f2cd11c6cc7210cea6896ed464fddfe3fec (diff) | |
| download | vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.tar.gz vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.tar.bz2 vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.zip | |
libxcb xserver pixman mesa git update 20 sep 2012
libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea
xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345
pixman: 3124a51abb89475b8c5045bc96e04c5852694a16
mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9
Diffstat (limited to 'xorg-server/hw/xfree86/modes')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Crtc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index e3eaf5f4c..177f7ac11 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -66,6 +66,7 @@ xf86CrtcConfigInit(ScrnInfoPtr scrn, const xf86CrtcConfigFuncsRec * funcs) config = xnfcalloc(1, sizeof(xf86CrtcConfigRec)); config->funcs = funcs; + config->compat_output = -1; scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config; } @@ -1841,7 +1842,7 @@ SetCompatOutput(xf86CrtcConfigPtr config) if (compat >= 0) { config->compat_output = compat; } - else { + else if (config->compat_output >= 0 && config->compat_output < config->num_output) { /* Don't change the compat output when no valid outputs found */ output = config->output[config->compat_output]; } |