fix(installer): keep dtoverlay and max_framebuffers on separate lines in config.txt#2911
Merged
Merged
Conversation
… in config.txt
`{%- endif %}` stripped the trailing newline from `dtoverlay=vc4-kms-v3d`
and Ansible's `trim_blocks=True` stripped the newline after `endif %}`,
gluing the two lines together as `dtoverlay=vc4-kms-v3dmax_framebuffers=2`.
The vc4-kms-v3d overlay then failed to load, no DRM device registered,
and the display fell back to a non-16:9 framebuffer (pillarboxing on 16:9
TVs). Same bug on Pi 5 — `dtoverlay=vc4-kms-v3d,cma-512max_framebuffers=2`.
Dropping the `-` from the if/else/endif whitespace controls lets each
branch keep its trailing newline.
Fixes #2910
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issues Fixed
Fixes #2910
Description
ansible/roles/system/templates/config.txt.j2produced a glued line in the generated/boot/firmware/config.txt:{%- endif %}stripped the trailing newline fromdtoverlay=vc4-kms-v3d, and Ansible'strim_blocks=Truethen stripped the newline afterendif %}, concatenating the two directives. Dropping the-whitespace-trim markers from the{% if %}/{% else %}/{% endif %}lets each branch keep its trailing newline.Failure modes (before fix)
The bug manifests differently per board:
vc4-kms-v3dmax_framebuffers=2is an unknown overlay name → vc4 overlay fails to load entirely. No DRM device registers, framebuffer falls back to1920x1280, 16:9 TVs pillarbox. (This is the user-visible report in [BUG] Broken dtoverlay line in /boot/firmware/config.txt - vc4-kms-v3d and max_framebuffers smushed together #2910.)vc4-kms-v3d,cma-512max_framebuffers=2still loadsvc4-kms-v3d(the firmware parser sees the comma as the overlay/param separator), butcma-512is corrupted intocma-512max_framebuffers=2(unrecognized param) and the standalonemax_framebuffers=2line is lost. Silently breaks two things: CMA stays at default 64 MiB instead of 512 MiB (kneecaps 4K HEVC decode headroom added in feat(viewer,server): per-board HW decode dispatch + codec gate on upload #2885), andmax_framebuffersdrops from 2 → 1.Reproduction & verification on the test fleet
Rendered the broken (pre-fix) and fixed templates for each
device_type, deployed both to real hardware, rebooted between, and inspected the system state.dtoverlay=vc4-kms-v3ddtoverlay=vc4-kms-v3d,cma-512lsmod | grep ^vc4/sys/class/drm/versionfbset -i)1920x1280(pillarbox)3840x2160(16:9)3840x21603840x2160CmaTotal(/proc/meminfo)max_framebuffersrpi_hevc_dec/dev/video*HEVC nodesLocal Jinja2 rendering also verified for the remaining device types (
pi2,pi3,x86,arm64) — all renderdtoverlay=…andmax_framebuffers=2on separate lines after the fix.Also audited
cmdline.txt.j2— clean (no control-flow tags between literal lines; token list is joined with explicit' ').Checklist