From cf19e527231f5d9d1e76f151b8c21d60d47b443e Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 1 Aug 2024 11:43:51 +0200 Subject: [PATCH] meson,ci: remove dead `kmsro` option in `gallium-drivers` Fixes: 70813c1c13b99cb029c8 ("meson: Remove kmsro from gallium-drivers") Part-of: (cherry picked from commit 89863a050bea429d9574a307bc28953bb60accaf) --- .gitlab-ci/build/gitlab-ci.yml | 16 ++++++++-------- .pick_status.json | 2 +- meson_options.txt | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 283bd1de5c6..1d450f90fa4 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -138,7 +138,7 @@ debian-testing-msan: # GLSL has some issues in sexpression reading. # gtest has issues in its test initialization. MESON_TEST_ARGS: "--suite glcpp --suite format" - GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus" + GALLIUM_DRIVERS: "freedreno,iris,nouveau,r300,r600,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus" VULKAN_DRIVERS: intel,amd,broadcom,virtio # Do a host build for intel-clc (msan complains about # uninitialized values in the LLVM libs) @@ -176,7 +176,7 @@ debian-testing-msan: -D gallium-xa=enabled -D gallium-nine=false -D gallium-rusticl=false - GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus" + GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus" VULKAN_DRIVERS: swrast EXTRA_OPTION: > -D spirv-to-dxil=true @@ -240,7 +240,7 @@ debian-release: -D gallium-nine=false -D gallium-rusticl=false -D llvm=enabled - GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,freedreno,r300,svga,llvmpipe,softpipe,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus" + GALLIUM_DRIVERS: "i915,iris,nouveau,freedreno,r300,svga,llvmpipe,softpipe,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus" VULKAN_DRIVERS: "amd,imagination-experimental,microsoft-experimental" EXTRA_OPTION: > -D spirv-to-dxil=true @@ -273,7 +273,7 @@ alpine-build-testing: -D glvnd=disabled -D platforms=wayland LLVM_VERSION: "16" - GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink" + GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink" GALLIUM_ST: > -D dri3=enabled -D gallium-extra-hud=true @@ -321,7 +321,7 @@ fedora-release: -D intel-rt=enabled -D imagination-srv=true -D teflon=true - GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink" + GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink" GALLIUM_ST: > -D dri3=enabled -D gallium-extra-hud=true @@ -433,7 +433,7 @@ debian-android: - debian/arm64_build variables: VULKAN_DRIVERS: freedreno,broadcom - GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink" + GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink" BUILDTYPE: "debugoptimized" tags: - aarch64 @@ -447,7 +447,7 @@ debian-arm32: DRI_LOADERS: -D glvnd=disabled # remove llvmpipe from the .meson-arm list because here we have llvm=disabled - GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink" + GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink" EXTRA_OPTION: > -D llvm=disabled -D valgrind=disabled @@ -575,7 +575,7 @@ debian-clang: -D shared-llvm=enabled -D opencl-spirv=true -D shared-glapi=enabled - GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi" + GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi" VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau EXTRA_OPTION: -D spirv-to-dxil=true diff --git a/.pick_status.json b/.pick_status.json index e32ea00dedf..82e9d1e0fa2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1534,7 +1534,7 @@ "description": "meson,ci: remove dead `kmsro` option in `gallium-drivers`", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "70813c1c13b99cb029c8fa3537163650bdd17b6d", "notes": null diff --git a/meson_options.txt b/meson_options.txt index 66b0d6c6fe4..bbc4fd98cf1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -86,7 +86,7 @@ option( type : 'array', value : ['auto'], choices : [ - 'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno', + 'auto', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno', 'swrast', 'v3d', 'vc4', 'etnaviv', 'tegra', 'i915', 'svga', 'virgl', 'panfrost', 'iris', 'lima', 'zink', 'd3d12', 'asahi', 'crocus', 'all', 'softpipe', 'llvmpipe',