From fe887afa44ead8f86cc0e1018699ae6038ef7372 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 5 Jan 2026 18:29:00 +0100 Subject: [PATCH] rusticl: fix 'enable-drivers' meson option Fixes: 1301d61de41e4c12c076 ("rusticl: allow devices to be enabled by default") Fixes: 9cdf897c5ed3aa2903c4 ("rusticl: allow asahi to be enabled by default") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/14302 (cherry picked from commit 5a917f035c651aaff77af69e1ed9a0ac874d4787) Part-of: --- .pick_status.json | 2 +- meson.options | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4d07a5aa37e..6cecd97022e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -434,7 +434,7 @@ "description": "rusticl: fix 'enable-drivers' meson option", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "1301d61de41e4c12c0767ab75d8a2cabe977509e", "notes": null diff --git a/meson.options b/meson.options index b1f98d7452a..63d78bee41e 100644 --- a/meson.options +++ b/meson.options @@ -147,7 +147,8 @@ option( option( 'gallium-rusticl-enable-drivers', type : 'array', - value : ['auto', 'asahi', 'freedreno', 'radeonsi'], + value : ['auto'], + choices : ['auto', 'asahi', 'freedreno', 'radeonsi'], description : 'List of gallium drivers for which rusticl will be enabled ' + 'by default', )