Skip to content

Commit 60822cd

Browse files
authored
Merge branch 'master' into master
2 parents 620f456 + 63d2b22 commit 60822cd

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Diff for: .github/workflows/freebsd.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on: [push, pull_request]
44

55
jobs:
66
freebsd:
7-
runs-on: macos-12
7+
runs-on: ubuntu-latest
88
steps:
99
- name: 'Checkout'
1010
uses: actions/checkout@v4
1111
- name: 'Install prerequisites and build'
12-
uses: vmactions/freebsd-vm@v0
12+
uses: vmactions/freebsd-vm@v1
1313
with:
1414
prepare: |
1515
pkg install -y meson pkgconf libdrm libXext libXfixes wayland

Diff for: va/drm/va_drm_utils.c

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ VA_DRM_GetDriverNames(VADriverContextP ctx, char **drivers, unsigned *num_driver
5959
const char * const drm_driver;
6060
const char * const va_driver[MAX_NAMES];
6161
} map[] = {
62+
{ "xe", { "iHD" } },
6263
{ "i915", { "iHD", "i965" } }, // Intel Media and OTC GenX
6364
{ "pvrsrvkm", { "pvr" } }, // Intel UMG PVR
6465
{ "radeon", { "r600", "radeonsi" } }, // Mesa Gallium

0 commit comments

Comments
 (0)