xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-glamor-gbm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c8d2744584868aa2655bf3ec047f2f9669e4291
Author: Simon Ser <contact at emersion.fr>
Date:   Mon May 4 10:53:57 2020 +0200

    xwayland: don't use GBM_BO_USE_SCANOUT
    
    This flag should only be used when the caller intends to display the
    buffer on a hardware plane. Xwayland isn't a DRM client, so it doesn't
    make sense to use this flag.
    
    This change will allow the driver to potentially use buffer parameters
    that are more optimized.
    
    Signed-off-by: Simon Ser <contact at emersion.fr>
    Reviewed-by: Daniel Stone <daniels at collabora.com>
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index df05bff6c..379fe9c8c 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -239,7 +239,7 @@ xwl_glamor_gbm_create_pixmap(ScreenPtr screen,
 #endif
         {
             bo = gbm_bo_create(xwl_gbm->gbm, width, height, format,
-                               GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+                               GBM_BO_USE_RENDERING);
         }
 
         if (bo) {