Repository navigation
drm/apple: show the notch when the boot loader keeps it - #578
Closed
jgoyvaerts wants to merge 1 commit into
Closed
jgoyvaerts wants to merge 1 commit into
jgoyvaerts wants to merge 1 commit into
Conversation
Showing the notch takes two switches today: aura's chosen.asahi,show-notch=1 keeps the notch rows in the boot framebuffer, and appledrm.show_notch=1 keeps them in the mode. With only the first, the boot framebuffer covers the full panel and the mode does not, so fbcon and Plymouth jump by the notch height at the handoff; with only the second, it is the other way round. aura passes the setting on as /chosen/asahi,show-notch = "1". Read it, so the boot loader setting alone shows the notch from the first frame to the desktop. The module parameters still turn it on as before. On the J616s (MacBook Pro M4 Pro) the mode is 3456x2160 without it and 3456x2234 with it (apple,notch-height = 74). Signed-off-by: Jonathan Goyvaerts <jonathan.goyvaerts@gmail.com> Assisted-by: LLM
Contributor
Author
|
Replaced by #884, the same change on current integration/aurora. This PR is left as it was, with no history rewritten. |
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
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.
Showing the notch currently takes two switches that have to agree:
chosen.asahi,show-notch=1keeps the notch rows in the boot framebuffer (kboot_show_notch()), andappledrm.show_notch=1(ort6030_show_notch=1) keeps them in the mode.If only aura's is set, the boot framebuffer covers the full panel and the mode does not, so fbcon/Plymouth shift by the notch height at the handoff (and the desktop loses the rows).
aura.conf.examplealready says "Pair with appledrm.show_notch=1 on Linux".aura passes its setting on as
/chosen/asahi,show-notch = "1". This makesdcp_show_notch()read it too, so the boot loader setting alone shows the notch from the first frame to the desktop. The default is unchanged (hidden): no property, or any value other than"1", behaves as before, and the module parameters still turn it on.dcp_show_notch()is the only reader of the notch switches; everything downstream (mode list, scanout offset, paneladj-height-mm, the v26.6 path) followsdcp->notch_height, so nothing else changes.On the J616s (MacBook Pro M4 Pro, 25G83, classic IOMFB path) the internal panel mode is 3456x2160 without it and 3456x2234 with it (
apple,notch-height = 74).Testing: builds with W=1, checkpatch clean. Not booted with this change yet: the J616s boot with only aura's
chosen.asahi,show-notch=1(no module parameter) will be reported here before merge.🤖 Generated with Claude Code