xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Privstr.h      |    1 -
 hw/xfree86/os-support/shared/sigio.c |    6 ------
 2 files changed, 7 deletions(-)

New commits:
commit 36e353bcf428c4e6a31292ffa749ea6395cba4a3
Author: Prabhu Sundararaj <prabhu.sundararaj at nxp.com>
Date:   Wed Nov 25 08:02:41 2020 +0100

    Remove check for useSIGIO option
    
    Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removed the option to
    configure useSIGIO option. Indeed, the xfree86 SIGIO support was
    reworked to use internal versions of OsBlockSIGIO and OsReleaseSIGIO.
    
    As a result, useSIGIO is no longer needed and can dropped
    
    Fixes: 6a5a4e60 - Remove SIGIO support for input [v5]
    Closes: xorg/xserver#1107
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj at nxp.com>
    Signed-off-by: Mylène Josserand <mylene.josserand at free-electrons.com>
    Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>

diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 914f04f67..31861148f 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -78,7 +78,6 @@ typedef struct {
     Bool miscModInDevEnabled;   /* Allow input devices to be
                                  * changed */
     Bool miscModInDevAllowNonLocal;
-    Bool useSIGIO;              /* Use SIGIO for handling DRI1 swaps */
     Bool pmFlag;
     MessageType iglxFrom;
     XF86_GlxVisuals glxVisuals;
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index ccf9d89d7..ad8af6093 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
     int i;
     int installed = FALSE;
 
-    if (!xf86Info.useSIGIO)
-        return 0;
-
     for (i = 0; i < MAX_FUNCS; i++) {
         if (!xf86SigIOFuncs[i].f) {
             if (xf86IsPipe(fd))
@@ -257,9 +254,6 @@ xf86RemoveSIGIOHandler(int fd)
     int max;
     int ret;
 
-    if (!xf86Info.useSIGIO)
-        return 0;
-
     max = 0;
     ret = 0;
     for (i = 0; i < MAX_FUNCS; i++) {