xserver: Branch 'server-21.1-branch' - 2 commits

[GitLab Mirror]

 hw/xfree86/drivers/inputtest/inputtestdrv.man |    6 +++---
 hw/xfree86/modes/xf86Crtc.h                   |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit db0da823f55734baf4c1e4de680e7091f33aac17
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Oct 31 11:28:28 2021 +0100

    Make xf86CompatOutput() return NULL when there are no privates
    
    Some drivers (mach64 w/o DRI for instance) don't initialize privates.
    
    Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>
    (cherry picked from commit 80eeff3ebac772e25c9107199989e677457dbe06)

diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index fcba5c902..7a562874c 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/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];
commit fdb266ff814f6abb6ce006ecbac5ba78a92cdbca
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Tue Nov 2 14:04:08 2021 +0000

    s/__/@/ in inputtestdrv manpage
    
    Update manpage subsitution style for 2e497bf8
    
    (cherry picked from commit 0099412ea4347b02e61ea21946f309f2535cc07b)

diff --git a/hw/xfree86/drivers/inputtest/inputtestdrv.man b/hw/xfree86/drivers/inputtest/inputtestdrv.man
index 566e4f35a..b0aa76dd3 100644
--- a/hw/xfree86/drivers/inputtest/inputtestdrv.man
+++ b/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 at radix.lt>
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+ at xservername@(@appmansuffix@), @xconfigfile@(@filemansuffix@), Xserver(@appmansuffix@), X(@miscmansuffix@)