Repository navigation
Sync aurora-wip with integration/aurora (display gate fold, T8122 knob) - #538
Merged
Merged
Conversation
t8122_hwdata.rs described the +0x418c block as written "unless asahi.t8122_hwdata_418c=0" and carried a parser and on/off values for that parameter. No module parameter was ever registered and nothing calls the parser, so the switch exists only on paper, and Aurora selects behaviour from the chip and firmware identity, not from command line switches. Remove the parameter values, parse(), enabled() and their test, and say that the identity selects the block as it selects the rest of HwDataA. The words, the offset, write() and its tests are unchanged, so the host tests still check the data Satya Benson recorded. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The gate already serves T6030, T6031 and T8122 through struct gate_soc, so it is no longer a T6030 driver. Rename the file to display-gate.c, the object to apple-display-gate and the option to APPLE_DISPLAY_GATE, so the other SoCs' internal display handoffs can join it instead of growing a driver each. No functional change: the gate, its SoC table, its command line options and its KUnit test are unchanged. The driver was written by Chris Kearney; this only moves it. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The J616s internal display and external display chain had their own gate, t6041-display-gate.c, beside the display gate that already serves T6030, T6031 and T8122. Both do the same job: enable the display nodes the device tree keeps disabled, before devices are created, once the boot loader's handoff checks out. Make T6041 an entry in the display gate's SoC table, matched on the apple,t6040 SoC compatible instead of the J616s board. Its handoff has a sequence of its own (the DCP is adopted running and the PMP is the device tree's own), so struct gate_soc gains a run hook, and the T6041 checks use the gate's existing helpers (gate_marked(), gate_disabled(), gate_target()) instead of copies. Appending a display DART to the display subsystem's iommus is now one helper, gate_iommus_append(), shared by the T6030 external processors and the J616s external chain; it is not __init, as the external chain is powered up from a work item. The checks, the order of the enabled nodes, the staged external power-up and the messages (with their apple-t6041-display: prefix) are as before. APPLE_T6041_DISPLAY_GATE is gone; APPLE_DISPLAY_GATE covers it and was already on wherever the T6041 gate was. The T6041 gate was written by Ryan Murray, its external display power-up by František Balázsy. Assisted-by: LLM Signed-off-by: Ryan Murray <ryan@aurorasilicon.org> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
J616s consolidation: batch5 kernel on the current integration/aurora
soc: apple: one display gate for T6030, T6031, T8122 and T6041
…-20261028 drm/asahi: m3: drop the unused T8122 HwDataA switch
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.
Keeps aurora-wip a superset of integration/aurora. It brings in the two folds that landed on integration/aurora after the 2026-10-28 consolidation (#534):
Both are already hardware-tested on integration/aurora: J616s fold1 tether boot and the Neo smoke of the same tree.
🤖 Generated with Claude Code