diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2021-11-11 09:10:05 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2021-11-11 09:10:05 +0000 |
| commit | a7ab4c7b05e99ab86cb614f4b020d55065daaa65 (patch) | |
| tree | fd067d48690a6c6224efcb561d46a75170396d73 /xserver/hw | |
| parent | 79250ad1e2b76f2ba5aa8d6dc0134c6c07ceac3a (diff) | |
Update to xserver 21.1.1
Diffstat (limited to 'xserver/hw')
| -rw-r--r-- | xserver/hw/xfree86/drivers/inputtest/inputtestdrv.man | 6 | ||||
| -rw-r--r-- | xserver/hw/xfree86/modes/xf86Crtc.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/xserver/hw/xfree86/drivers/inputtest/inputtestdrv.man b/xserver/hw/xfree86/drivers/inputtest/inputtestdrv.man index 566e4f35a..b0aa76dd3 100644 --- a/xserver/hw/xfree86/drivers/inputtest/inputtestdrv.man +++ b/xserver/hw/xfree86/drivers/inputtest/inputtestdrv.man @@ -1,6 +1,6 @@ .\" shorthand for double quote that works everywhere. .ds q \N'34' -.TH INPUTTEST __drivermansuffix__ __vendorversion__ +.TH INPUTTEST @drivermansuffix@ @vendorversion@ .SH NAME inputtest \- An X.Org input driver for testing .SH SYNOPSIS @@ -21,7 +21,7 @@ exposed by Xorg. The primary use cases of this input driver are various integration tests that need to interface with the input subsystem. .SH CONFIGURATION DETAILS -Please refer to __xconfigfile__(__filemansuffix__) for general configuration +Please refer to @xconfigfile@(@filemansuffix@) for general configuration details and for options that can be used with all input drivers. This section only covers configuration details specific to this driver. .PP @@ -109,4 +109,4 @@ processed all input events sent to it so far. .SH AUTHORS Povilas Kanapickas <povilas@radix.lt> .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +@xservername@(@appmansuffix@), @xconfigfile@(@filemansuffix@), Xserver(@appmansuffix@), X(@miscmansuffix@) diff --git a/xserver/hw/xfree86/modes/xf86Crtc.h b/xserver/hw/xfree86/modes/xf86Crtc.h index fcba5c902..7a562874c 100644 --- a/xserver/hw/xfree86/modes/xf86Crtc.h +++ b/xserver/hw/xfree86/modes/xf86Crtc.h @@ -839,6 +839,9 @@ xf86CompatOutput(ScrnInfoPtr pScrn) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); + if (xf86CrtcConfigPrivateIndex == -1) + return NULL; + if (config->compat_output < 0) return NULL; return config->output[config->compat_output]; |