xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/drivers/modesetting/driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cbdde938cbaf604741cd057fac743859ada342ec
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Sep 27 11:43:52 2019 -0400

    modesetting: Reduce "glamor initialization failed" message to X_INFO
    
    This might be an error or not, for example refusing to work on llvmpipe
    is normal and expected. glamor_egl_init() will print X_ERROR messages if
    appropriate, so we don't need to here.
    
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 61db67ab4..da7279c13 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -772,7 +772,7 @@ try_enable_glamor(ScrnInfoPtr pScrn)
             xf86DrvMsg(pScrn->scrnIndex, X_INFO, "glamor initialized\n");
             ms->drmmode.glamor = TRUE;
         } else {
-            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                        "glamor initialization failed\n");
         }
     } else {