fix(linux): auto-detect GPU with connected display for VAAPI and Vulkan by neatnoise · Pull Request #4961 · LizardByte/Sunshine

neatnoise · 2026-04-08T14:08:12Z

Description

On multi-GPU Linux systems, both VAAPI and Vulkan encoders hardcoded /dev/dri/renderD128 (or passed nullptr for FFmpeg auto-detect) as the default render device when adapter_name was not configured. This caused the encoder to use the wrong GPU (e.g. Intel iGPU instead of the Nvidia dGPU driving the display), leading to encode failures or unnecessary cross-GPU copies.

This PR introduces platf::resolve_render_device() which centralizes render device resolution:

User's adapter_name config → used as-is
Auto-detected GPU with connected display (via DRM connector scanning)
/dev/dri/renderD128 if detection fails

The DRM detection logic (find_render_node_with_display()) scans card devices for a connector in DRM_MODE_CONNECTED state and returns the corresponding render node via drmGetRenderDeviceNameFromFd(). This is kept internal to linux/misc.cpp.

All Linux encoder paths now use platf::resolve_render_device() consistently:

video.cpp — VAAPI and Vulkan hardware input buffer init
vaapi.cpp — encode device creation and error reporting
vulkan_encode.cpp — Vulkan hardware device creation

Previously the adapter_name → render_device resolution logic was duplicated across these files. Now it lives in one place, avoiding potential mismatches.

Screenshot

Issues Fixed or Closed

Fixes Black screen when forcing Vulkan encoder – appears to select iGPU instead of Nvidia GPU #4952

Roadmap Issues

Type of Change

Checklist

Code follows the style guidelines of this project
Code has been self-reviewed
Code has been commented, particularly in hard-to-understand areas
Code docstring/documentation-blocks for new or existing methods/components have been added or updated
Unit tests have been added or updated for any new or modified functionality

AI Usage

None: No AI tools were used in creating this PR
Light: AI provided minor assistance (formatting, simple suggestions)
Moderate: AI helped with code generation or debugging specific parts
Heavy: AI generated most or all of the code changes

codecov · 2026-04-08T16:04:54Z

Bundle Report

Bundle size has no change ✅

codecov · 2026-04-08T17:58:39Z

Codecov Report

❌ Patch coverage is 38.77551% with 30 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (master@b319485). Learn more about missing BASE report.
⚠️ Report is 1 commits behind head on master.
✅ All tests successful. No failed tests found.

Files with missing lines	Patch %	Lines
src/platform/linux/misc.cpp	48.64%	14 Missing and 5 partials ⚠️
src/video.cpp	0.00%	2 Missing and 2 partials ⚠️
src/platform/linux/vaapi.cpp	33.33%	1 Missing and 1 partial ⚠️
src/platform/macos/misc.mm	0.00%	2 Missing ⚠️
src/platform/windows/misc.cpp	0.00%	2 Missing ⚠️
src/platform/linux/vulkan_encode.cpp	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##             master    #4961   +/-   ##
=========================================
  Coverage          ?   18.03%           
=========================================
  Files             ?      108           
  Lines             ?    23464           
  Branches          ?    10363           
=========================================
  Hits              ?     4232           
  Misses            ?    15095           
  Partials          ?     4137

Flag	Coverage Δ
Archlinux	`11.62% <16.66%> (?)`
FreeBSD-14.3-amd64	`13.62% <37.50%> (?)`
Homebrew-ubuntu-22.04	`14.01% <38.63%> (?)`
Linux-AppImage	`12.29% <38.63%> (?)`
Windows-AMD64	`14.90% <0.00%> (?)`
Windows-ARM64	`13.21% <0.00%> (?)`
macOS-arm64	`19.02% <0.00%> (?)`
macOS-x86_64	`18.37% <0.00%> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
src/platform/common.h	`32.40% <ø> (ø)`
src/platform/linux/vulkan_encode.cpp	`0.34% <0.00%> (ø)`
src/platform/linux/vaapi.cpp	`2.84% <33.33%> (ø)`
src/platform/macos/misc.mm	`9.00% <0.00%> (ø)`
src/platform/windows/misc.cpp	`16.40% <0.00%> (ø)`
src/video.cpp	`32.35% <0.00%> (ø)`
src/platform/linux/misc.cpp	`17.63% <48.64%> (ø)`

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b319485...d56679d. Read the comment docs.

Clutchnp · 2026-04-16T07:41:44Z

instead of using render_device would you be open to using adapter_name itself so we can pass that around and avoid mismatches by running the same logic again and again, @ReenigneArcher @neatnoise

neatnoise · 2026-04-16T15:54:01Z

instead of using render_device would you be open to using adapter_name itself so we can pass that around and avoid mismatches by running the same logic again and again, @ReenigneArcher @neatnoise

Good point! Done — added platf::resolve_render_device() that resolves it once (user config -> auto-detect -> /dev/dri/renderD128 fallback). All call sites now use it. Went with render_device as the common concept since that's what both VAAPI and the config (adapter_name on Linux is a render device path) naturally work with. Vulkan just has an extra step to map it to a device index. I also changed the description by adding support for VAAPI too.

neatnoise · 2026-04-16T19:25:10Z

False sonarqubecloud notification. There isn't sopen for linux

…renderD128 On multi-GPU systems the Vulkan encoder defaulted to /dev/dri/renderD128 which may not be the GPU driving the display. This caused encode failures or unnecessary cross-GPU copies. Add platf::find_render_node_with_display() which scans DRM connectors to find the GPU with a connected monitor and returns its render node path. Use this as the default when adapter_name is not configured. Fallback chain: user config > auto-detected GPU > renderD128 > FFmpeg default.

…nder_device() Replace duplicated adapter_name → render_device resolution logic across video.cpp, vaapi.cpp, and vulkan_encode.cpp with a single platf::resolve_render_device() function. The resolution order is: 1. config::video.adapter_name if set by user 2. Auto-detected GPU with connected display (find_render_node_with_display) 3. /dev/dri/renderD128 fallback find_render_node_with_display() is now internal to linux/misc.cpp, removed from the public platf:: API and platform stubs.

sonarqubecloud · 2026-04-17T17:34:13Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

…an (LizardByte#4961) fix wrong render_node selection in linux

neatnoise changed the title ~~fix(linux/vulkan): auto-detect GPU with connected display for Vulkan encoder~~ fix(linux): auto-detect GPU with connected display for Vulkan encoder Apr 8, 2026

neatnoise mentioned this pull request Apr 8, 2026

Black screen when forcing Vulkan encoder – appears to select iGPU instead of Nvidia GPU #4952

Closed

2 tasks

ReenigneArcher changed the title ~~fix(linux): auto-detect GPU with connected display for Vulkan encoder~~ fix(linux/vulkan): auto-detect GPU with connected display Apr 8, 2026

ReenigneArcher added this to the vulkan milestone Apr 8, 2026

neatnoise force-pushed the vulkan-default-gpu branch 2 times, most recently from a0b3617 to 1e54ff0 Compare April 8, 2026 15:10

neatnoise mentioned this pull request Apr 12, 2026

Segfault (SIGSEGV) during vaapi encoder probing on Intel Arc B580 (BMG G21) - regression from 2025.924.154138 #4966

Open

2 tasks

neatnoise force-pushed the vulkan-default-gpu branch from 1e54ff0 to 17e6e0a Compare April 12, 2026 15:30

ReenigneArcher force-pushed the vulkan-default-gpu branch from 17e6e0a to 34591e7 Compare April 13, 2026 14:40

neatnoise force-pushed the vulkan-default-gpu branch from 34591e7 to abc2166 Compare April 15, 2026 16:18

neatnoise changed the title ~~fix(linux/vulkan): auto-detect GPU with connected display~~ fix(linux): auto-detect GPU with connected display for VAAPI and Vulkan Apr 16, 2026

Clutchnp mentioned this pull request Apr 16, 2026

fix(linux): wrong render_node selection in linux #4959

Closed

21 tasks

ReenigneArcher reviewed Apr 17, 2026

View reviewed changes

Comment thread src/platform/linux/vaapi.cpp Outdated

neatnoise and others added 4 commits April 17, 2026 13:18

fix: qualify POSIX open() and use C++17 if-init for render_path

f96eb83

style: ignore sonar warning

d56679d

ReenigneArcher force-pushed the vulkan-default-gpu branch from 768975f to d56679d Compare April 17, 2026 17:18

ReenigneArcher merged commit 3210078 into LizardByte:master Apr 17, 2026
70 of 71 checks passed

Clutchnp pushed a commit to Clutchnp/Sunshine that referenced this pull request Apr 17, 2026

fix(linux): auto-detect GPU with connected display for VAAPI and Vulk…

a5300a4

…an (LizardByte#4961) fix wrong render_node selection in linux

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(linux): auto-detect GPU with connected display for VAAPI and Vulkan#4961

fix(linux): auto-detect GPU with connected display for VAAPI and Vulkan#4961
ReenigneArcher merged 4 commits intoLizardByte:masterfrom
neatnoise:vulkan-default-gpu

neatnoise commented Apr 8, 2026 •

edited

Loading

Uh oh!

codecov bot commented Apr 8, 2026

Uh oh!

codecov bot commented Apr 8, 2026 •

edited

Loading

Uh oh!

Clutchnp commented Apr 16, 2026

Uh oh!

neatnoise commented Apr 16, 2026 •

edited

Loading

Uh oh!

neatnoise commented Apr 16, 2026

Uh oh!

Uh oh!

sonarqubecloud bot commented Apr 17, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

neatnoise commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

Checklist

AI Usage

Uh oh!

codecov bot commented Apr 8, 2026

Bundle Report

Uh oh!

codecov bot commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Clutchnp commented Apr 16, 2026

Uh oh!

neatnoise commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

neatnoise commented Apr 16, 2026

Uh oh!

Uh oh!

sonarqubecloud bot commented Apr 17, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

neatnoise commented Apr 8, 2026 •

edited

Loading

codecov bot commented Apr 8, 2026 •

edited

Loading

neatnoise commented Apr 16, 2026 •

edited

Loading