Merge branch 'master' into master

intel · Nov 29, 2023 · 60822cd · 60822cd
2 parents 620f456 + 63d2b22
commit 60822cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
@@ -4,12 +4,12 @@ on: [push, pull_request]
 
 jobs:
   freebsd:
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     steps:
     - name: 'Checkout'
       uses: actions/checkout@v4
     - name: 'Install prerequisites and build'
-      uses: vmactions/freebsd-vm@v0
+      uses: vmactions/freebsd-vm@v1
       with:
         prepare: |
           pkg install -y meson pkgconf libdrm libXext libXfixes wayland

diff --git a/va/drm/va_drm_utils.c b/va/drm/va_drm_utils.c
@@ -59,6 +59,7 @@ VA_DRM_GetDriverNames(VADriverContextP ctx, char **drivers, unsigned *num_driver
         const char * const drm_driver;
         const char * const va_driver[MAX_NAMES];
     } map[] = {
+        { "xe",         { "iHD"              } },
         { "i915",       { "iHD", "i965"      } }, // Intel Media and OTC GenX
         { "pvrsrvkm",   { "pvr"              } }, // Intel UMG PVR
         { "radeon",     { "r600", "radeonsi" } }, // Mesa Gallium