Skip to content

Local UI to run and train LLMs and diffusion models. Supports GGUF, MLX, Qwen3.8, DeepSeek-V4.1, MiniMax-H3, Gemma 4, FLUX and more.

Desktop: stop the NVIDIA X11 flicker on WebKitGTK 2.54 (#16318) (#16322)

Indrajit swainf259cd5d3fd8
diff --git a/studio/src-tauri/src/linux_webkit.rs b/studio/src-tauri/src/linux_webkit.rs
index 317643922e0..206e91b85cc 100644
--- a/studio/src-tauri/src/linux_webkit.rs
+++ b/studio/src-tauri/src/linux_webkit.rs
@@ -57,6 +57,9 @@ const FORCE_DMABUF_REASON: &str = "DMA-BUF renderer requested by the environment
// 2.54.0 and 2.54.1 die with Error 71 under explicit sync (WebKit bug 280210); the fix (bug 324551)
// first shipped in 2.54.2. Other hosts can still crash at launch, so this path is supervised.
const NVIDIA_WAYLAND_GPU_MIN_VERSION: (u32, u32, u32) = (2, 54, 2);
+// Compositing off leaves an NVIDIA X11 window blank or flickering on 2.54+ (#16318);
+// DISABLE_DMABUF keeps it drawn, still unaccelerated, clear of the 580 driver's fence leak.
+const NVIDIA_X11_BLANK_WITHOUT_COMPOSITING: (u32, u32, u32) = (2, 54, 0);
/// The user's "GPU rendering" choice plus whether an earlier launch fell back on this host.
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
@@ -267,9 +270,16 @@ fn rendering_plan(
// #13875 has that shape and crashes with Error 71 under it, while DISABLE_DMABUF works.
let setting = env(DISABLE_COMPOSITING_SETTING);
let requested = |wanted: bool| setting.as_deref().and_then(compositing_setting) == Some(wanted);
+ let nvidia_x11_compositing_off = || {
+ if webkit_version >= NVIDIA_X11_BLANK_WITHOUT_COMPOSITING {
+ RenderingWorkaround::DisableDmabuf
+ } else {
+ RenderingWorkaround::DisableCompositingOnNvidiaX11
+ }
+ };
if requested(true) {
let workaround = if nvidia_x11 {
- RenderingWorkaround::DisableCompositingOnNvidiaX11
+ nvidia_x11_compositing_off()
} else if nvidia_driver_loaded && !force_dmabuf && wayland_session {
RenderingWorkaround::DisableCompositingOnNvidiaWayland
} else {
@@ -326,7 +336,7 @@ fn rendering_plan(
let workaround = if wayland_session || !shared_memory {
RenderingWorkaround::DisableDmabuf
} else if nvidia_driver_loaded {
- RenderingWorkaround::DisableCompositingOnNvidiaX11
+ nvidia_x11_compositing_off()
} else {
RenderingWorkaround::DisableCompositingOnX11
};
@@ -345,7 +355,7 @@ fn rendering_plan(
return RenderingPlan::Apply(nvidia_shared_memory(), GPU_ON_REASON);
}
return RenderingPlan::Apply(
- RenderingWorkaround::DisableCompositingOnNvidiaX11,
+ nvidia_x11_compositing_off(),
GPU_ON_OLD_NVIDIA_REASON,
);
}
@@ -378,7 +388,7 @@ fn rendering_plan(
}
// Wayland: DISABLE_DMABUF (FORCE_SHM hits bug 315436). X11: SHM, with compositing off below
- // the minimum driver branch; DISABLE_DMABUF can leave no transport there.
+ // the minimum driver branch; DISABLE_DMABUF can leave no transport there before 2.54.
if nvidia_driver_loaded {
let reason = if missing_appimage_gles {
NVIDIA_APPIMAGE_GLES_REASON
@@ -400,7 +410,7 @@ fn rendering_plan(
{
nvidia_shared_memory()
} else {
- RenderingWorkaround::DisableCompositingOnNvidiaX11
+ nvidia_x11_compositing_off()
};
return RenderingPlan::Apply(workaround, reason);
}
@@ -876,6 +886,62 @@ mod tests {
}
}
+ #[test]
+ fn nvidia_x11_without_compositing_disables_dmabuf_from_webkit_2_54() {
+ let appimage_x11: &[(&str, &str)] =
+ &[(APPIMAGE, "/tmp/Unsloth.AppImage"), (X11_DISPLAY, ":0")];
+ let forced: &[(&str, &str)] = &[(X11_DISPLAY, ":0"), (DISABLE_COMPOSITING_SETTING, "1")];
+ for (version, expected) in [
+ (
+ (2, 50, 4),
+ RenderingWorkaround::DisableCompositingOnNvidiaX11,
+ ),
+ (
+ (2, 52, 6),
+ RenderingWorkaround::DisableCompositingOnNvidiaX11,
+ ),
+ ((2, 54, 0), RenderingWorkaround::DisableDmabuf),
+ ((2, 54, 2), RenderingWorkaround::DisableDmabuf),
+ ] {
+ let plan = |vars, branch, setting| match plan_with_setting_on_branch(
+ vars,
+ version,
+ true,
+ Some(branch),
+ gpu(setting, false),
+ ) {
+ RenderingPlan::Apply(workaround, _) => workaround,
+ other => panic!("{version:?}: {other:?}"),
+ };
+ for vars in [X11_HOST, appimage_x11] {
+ assert_eq!(
+ plan(vars, 595, GpuRendering::Auto),
+ expected,
+ "Auto {version:?}"
+ );
+ assert_eq!(
+ plan(vars, 595, GpuRendering::On),
+ expected,
+ "On {version:?}"
+ );
+ assert_eq!(
+ plan(vars, 615, GpuRendering::Off),
+ expected,
+ "Off {version:?}"
+ );
+ }
+ assert_eq!(
+ plan(forced, 615, GpuRendering::Auto),
+ expected,
+ "forced {version:?}"
+ );
+ assert_eq!(
+ plan(X11_HOST, 615, GpuRendering::Auto),
+ RenderingWorkaround::ForceSharedMemoryOnNvidia
+ );
+ }
+ }
+
#[test]
fn the_setting_and_operator_overrides_outrank_the_branch_gate() {
let forced: &[(&str, &str)] = &[(X11_DISPLAY, ":0"), (DISABLE_COMPOSITING_SETTING, "1")];