Repository navigation
display: hand off the T6041 display on J614C too - #132
Merged
Merged
Conversation
The J614C (MacBook Pro 14-inch, M4 Max) has the J616C's T6041 display block. On joske's J614C (linux#1332), with apple,j614c added to the J616C entry, every ADT and hardware check of that entry passed: the DISP_CPU power state, the running DCP, dart-dcp and dart-disp0 locked, the segments and the SID 23, 0 and 16 page tables. It stopped only at the device tree check, because that kernel's J614c/J616c tree enabled /display-subsystem itself. The kernel tree now keeps those nodes disabled for the handoff, as the J616s tree does (linux#1332). Serve both M4 Max laptops from the one T6041 entry: its board list becomes apple,j616c and apple,j614c, renamed dcp_soc_t6041_max. Chip, firmware, addresses and SIDs stay as they were; nothing changes for any other board or chip. The host test runs the J616C scenarios for the J614C too (a boot publishes, the external memories come from the ADT, a J614C tree on a T6040 does nothing), checks the external regions of both M4 Max scenarios in full, and adds the refusal the J614C hit: an enabled display subsystem publishes nothing. Link: aurora-silicon/linux#1332 Signed-off-by: Diljit Singh <hey@djdev.me>
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.
Why
aurora-silicon/linux#1332: on joske's J614c (MacBook Pro 14-inch, M4 Max), the internal panel stays on simpledrm. aura's T6041 M4 Max display handoff serves only
apple,j616c. Withapple,j614cadded locally, joske's boot got through every ADT and hardware check of the J616C entry and stopped only at the device tree:That boot shows the J614c ADT matching the J616C entry: chip, 26.6.2 firmware, DCP and DART addresses, the running DCP, both DARTs locked, the firmware segments, and the SID 23/0/16 page tables. The refusal came from the kernel tree, which enabled
/display-subsystemitself. aurora-silicon/linux#1345 keeps those nodes disabled, as the J616s tree does, and makes the M4 Max display gate adopt this handoff.What
dcp_soc_t6041_j616cbecomesdcp_soc_t6041_max, servingapple,j616candapple,j614c. Chip, firmware gate, addresses and SIDs are unchanged, and nothing changes for other boards or chips.tests/t6041_display_host.c):j614c,j614c-externalandj614c-on-t6040scenarios, matching the J616C ones;display-enabledscenario for the refusal above: with an enabled display subsystem, nothing is published.Order with the kernel (aurora-silicon/linux#1345)
Either can land first. With a kernel tree that still enables the display subsystem, this refuses exactly as above, so the panel stays on simpledrm as it does today.
Testing
pytest tests/python/test_t6041_display_handoff.py: 63 passed (59 before, plus 4 new scenarios).USE_CLANG=1 BUILDSTD=1):CHAINLOADING=1, andRELEASE=1 CHAINLOADING=1 ESP_STAGE2=1 BUILTIN_LOGO=aurora. No new warnings.clang-format --dry-run --Werroris clean on the changed sources.🤖 Generated with Claude Code