xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xwayland/xwayland-glamor-eglstream.c |    8 +++++---
 hw/xwayland/xwayland-glamor-gbm.c       |    2 +-
 hw/xwayland/xwayland-glamor.c           |    6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 30d0d4a19be61dd7b61f5ced992cb299e6a38068
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Mon Nov 29 11:45:35 2021 +0100

    xwayland/glamor: Change errors to verbose messages
    
    On a normal startup sequence, the Xwayland glamor backend would log
    an error whenever a required Wayland protocol is missing.
    
    Those are not really errors though, more informational messages along
    the glamor backend selection process.
    
    Demote those errors to verbose messages to reduce the verbosity of
    Xwayland at startup by default.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Jonas Ådahl <jadahl at gmail.com>

diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
index 244fc68e9..9f95e6c14 100644
--- a/hw/xwayland/xwayland-glamor-eglstream.c
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
@@ -691,12 +691,14 @@ xwl_glamor_eglstream_has_wl_interfaces(struct xwl_screen *xwl_screen)
         xwl_eglstream_get(xwl_screen);
 
     if (xwl_eglstream->display == NULL) {
-        ErrorF("glamor: 'wl_eglstream_display' not supported\n");
+        LogMessageVerb(X_INFO, 3,
+                       "glamor: 'wl_eglstream_display' not supported\n");
         return FALSE;
     }
 
     if (xwl_eglstream->controller == NULL) {
-        ErrorF("glamor: 'wl_eglstream_controller' not supported\n");
+        LogMessageVerb(X_INFO, 3,
+                       "glamor: 'wl_eglstream_controller' not supported\n");
         return FALSE;
     }
 
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 7b5a9d6e5..60c63ba99 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -835,7 +835,7 @@ xwl_glamor_gbm_has_wl_interfaces(struct xwl_screen *xwl_screen)
     struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
 
     if (xwl_gbm->drm == NULL) {
-        ErrorF("glamor: 'wl_drm' not supported\n");
+        LogMessageVerb(X_INFO, 3, "glamor: 'wl_drm' not supported\n");
         return FALSE;
     }
 
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 55a41fae1..9911a66ac 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -415,7 +415,8 @@ xwl_glamor_select_gbm_backend(struct xwl_screen *xwl_screen)
         return TRUE;
     }
     else
-        ErrorF("Missing Wayland requirements for glamor GBM backend\n");
+        LogMessageVerb(X_INFO, 3,
+                       "Missing Wayland requirements for glamor GBM backend\n");
 #endif
 
     return FALSE;
@@ -431,7 +432,8 @@ xwl_glamor_select_eglstream_backend(struct xwl_screen *xwl_screen)
         return TRUE;
     }
     else
-        ErrorF("Missing Wayland requirements for glamor EGLStream backend\n");
+        LogMessageVerb(X_INFO, 3,
+                       "Missing Wayland requirements for glamor EGLStream backend\n");
 #endif
 
     return FALSE;
commit 96c82befa2c3f3dc3534743c67cc003c2106e9b0
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Mon Nov 15 16:02:34 2021 +0100

    xwayland/eglstream: Demote EGLstream device warning
    
    If no EGLstream capable device is found at startup, Xwayland's EGLstream
    backend will log an error message "glamor: No eglstream capable devices
    found".
    
    However, considering that the vast majority of drivers do not implement
    EGLstream, the lack of EGLstream capable device is more of the norm than
    the exception.
    
    Change the error message to a log verbose message.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Simon Ser <contact at emersion.fr>
    Reviewed-by: Jonas Ådahl <jadahl at gmail.com>

diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
index 28666460d..244fc68e9 100644
--- a/hw/xwayland/xwayland-glamor-eglstream.c
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
@@ -1079,7 +1079,7 @@ xwl_eglstream_get_device(struct xwl_screen *xwl_screen)
     free(devices);
 out:
     if (!device)
-        ErrorF("glamor: No eglstream capable devices found\n");
+        LogMessageVerb(X_INFO, 3, "glamor: No eglstream capable devices found\n");
     return device;
 }