xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/drivers/modesetting/dri2.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a7b0a7fabd137183cc42a5edb15697e354c4450c
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Nov 11 06:35:19 2021 +1000

    dri2: add crocus to the list of va_gl users

diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
index 7ff52be6d..8d1b742ef 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -1086,7 +1086,8 @@ ms_dri2_screen_init(ScreenPtr screen)
          * guess that the DRI and VDPAU drivers have the same name.
          */
         if (strcmp(driver_names[0], "i965") == 0 ||
-            strcmp(driver_names[0], "iris") == 0) {
+            strcmp(driver_names[0], "iris") == 0 ||
+            strcmp(driver_names[0], "crocus") == 0) {
             driver_names[1] = "va_gl";
         } else {
             driver_names[1] = driver_names[0];