xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xfree86/drivers/modesetting/driver.c        |    4 ++++
 hw/xfree86/drivers/modesetting/modesetting.man |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit 6ac3178c335d82eb2948fac1092807ab387a83b9
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Dec 15 16:59:04 2022 +0100

    modesetting: Log whether atomic modesetting is enabled
    
    If atomic modesetting is to be enabled in the configuration file, log
    whether this is supported and eventually enabled or disabled.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Martin Roukala <martin.roukala at mupuf.org>

diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 7a7d5c388..3f185489e 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -1370,9 +1370,13 @@ PreInit(ScrnInfoPtr pScrn, int flags)
     if (xf86ReturnOptValBool(ms->drmmode.Options, OPTION_ATOMIC, FALSE)) {
         ret = drmSetClientCap(ms->fd, DRM_CLIENT_CAP_ATOMIC, 1);
         ms->atomic_modeset = (ret == 0);
+        if (!ms->atomic_modeset)
+            xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Atomic modesetting not supported\n");
     } else {
         ms->atomic_modeset = FALSE;
     }
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+               "Atomic modesetting %sabled\n", ms->atomic_modeset ? "en" : "dis");
 
     /* TearFree requires glamor and, if PageFlip is enabled, universal planes */
     if (xf86ReturnOptValBool(ms->drmmode.Options, OPTION_TEARFREE, FALSE)) {
commit c066a46aaccc1a97e2069e296b5774e63fae68ab
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Dec 15 16:57:01 2022 +0100

    modesetting: Document the "Atomic" option
    
    The modesetting driver has atomic modesetting disabled by default but
    can be enabled (if supported) using a configuration option.
    
    Add this option in the man page.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Martin Roukala <martin.roukala at mupuf.org>

diff --git a/hw/xfree86/drivers/modesetting/modesetting.man b/hw/xfree86/drivers/modesetting/modesetting.man
index 9e40b04f3..485beff48 100644
--- a/hw/xfree86/drivers/modesetting/modesetting.man
+++ b/hw/xfree86/drivers/modesetting/modesetting.man
@@ -120,6 +120,10 @@ applications will still have the discretion to not use tearing prevention.
 The default is
 .B off.
 .TP
+.BI "Option \*qAtomic\*q \*q" boolean \*q
+Enable atomic modesetting when supported.  The default is
+.B off.
+.TP
 .SH "SEE ALSO"
 @xservername@(@appmansuffix@), @xconfigfile@(@filemansuffix@), Xserver(@appmansuffix@),
 X(@miscmansuffix@)