Repository navigation
arm64: dts: apple: t6050: enable the media engines on every board - #2278
Draft
RyanTheTide wants to merge 2 commits into
Draft
RyanTheTide wants to merge 2 commits into
RyanTheTide wants to merge 2 commits into
Conversation
The video encoder (ave0), the first ProRes engine (apr0) and both JPEG engines were enabled only on the J714s, and the video decoder (avd0) only on the J714c, J714s, J775d and K116s. Every T6050 board's ADT has these engines at the same addresses, with the same interrupts, DART streams and power states, so describe their enables once. Add t6050-media.dtsi with the J714s enables for the decoder, encoder, ProRes and JPEG engines, their DARTs and their power states, and include it from every T6050 board after t6050-peripherals.dtsi. The J714s, J714c and K116s lose their copies of these blocks. The J775d keeps the decoders that t6050-ultra.dtsi describes enabled; the shared file leaves them alone there. Every DART enabled here already carries its engine's power state (dart-ave0 both instances: VENC0_SYS, dart-apr0: SCODEC, dart-jpeg0: JPG, dart-avd0: AVD_SYS). The encoder's firmware preload is handed over by the boot loader by compatible, so it needs no per-board change. The second encoder (ave1) and the second ProRes engine (apr1) of the M5 Max stay disabled: the boot loader hands over only the first encoder's preloaded firmware, which the AVE driver requires, and the ProRes driver's T6050 variant only describes the first engine's window layout. DTBs: the J714s is byte-identical. The J714c gains apple,always-on on FAB1_SOC, as the J714s, K116s and J775d already have. Every other board gains whichever of these engines it lacked, so all eleven now enable the same media nodes as the J714s. The J714s blocks were written by DjDeveloperr, the J714c decoder block by Eduard Moldovan and the K116s decoder block by Jens Axboe. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
…DARTs
The apple,dart binding requires reg-names once a DART has two register
windows. ave0_dart, ave0_dart1 and jpeg0_dart have two each but no names,
so every board that enables them fails dtbs_check.
Name them after the DART instance each window is in the board's ADT:
ave0_dart's second window is its address filter ("dapf"); ave0_dart1's
second window and jpeg0_dart's (a shared gateway page) are neither a
DAPF nor a GAPF, so they are "auxiliary".
No functional change: the driver reads a "dapf" window only together
with apple,dapf-ranges, which these nodes do not have, and it does not
use "auxiliary" windows.
Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Member
|
Claude Fable 5.2 on @satchlj's behalf. J775c (Mac Studio M5 Max) probe row for this PR at head 93af6fd, one one-shot boot, nothing installed. OS firmware 27.0 (26A428), system firmware 27.2. 0 failed units. How it was booted, since it is not the PR tree as-is: the trial used a bootable J775c DTB carrying this PR's media bindings and enable properties, with references remapped to the board tree, and all four media drivers built in. The SD-card-reader PCI probe was skipped on the command line to get past a separate early boot failure in that path that we reproduce independently on the current integration tip.
|
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.
Problem
The video encoder (ave0), the first ProRes engine (apr0) and both JPEG engines are enabled only on the J714s. The video decoder (avd0) is enabled only on the J714c, J714s, J775d and K116s. Every T6050 board's ADT has these engines at the same addresses, with the same interrupts, DART streams and power states. So the J716c, J716s, J775c, J873s, K114c, K114s, K116c and K116s have no hardware video decode, and no board but the J714s has hardware encode, ProRes or JPEG.
Change
t6050-media.dtsi: the J714s enables for the decoder, encoder, ProRes and JPEG engines, their DARTs and power states (pmgr4, FAB1_SOC always-on, AVD_SYS, FAB0_PIOGW and FAB7_SOC firmware-owned, SCODEC, FAB1_PIOGW firmware-owned, FAB0_SOC always-on, VENC0_*, JPG).t6050-peripherals.dtsi. The J714s, J714c and K116s lose their copies of these blocks.#ifndef T6050_J775D), becauset6050-ultra.dtsialready describes both dies' decoders enabled.dt_set_ave()takes the firstapple,t6050-avenode and ADT ave0), and the AVE driver refuses an encoder without its two preloaded segments (ave-fw.cave_fw_probe()). The ProRes driver's T6050 variant needs the first engine'score/wrapper/aux/ctrlwindows and SCODEC rows. apr1 is in the PRORES power state with a different window layout, and no variant describes that. The new file says this in a comment.apple/avd-fw-v5-t2.bin). ProRes and JPEG need no firmware.The J714s blocks were written by DjDeveloperr, the J714c decoder block by Eduard Moldovan, and the K116s decoder block by Jens Axboe.
Testing
make dtbs CHECK_DTBS=y(dtschema) for every T6050 DTB on this branch: builds clean, no dtc warnings, and no schema message that integration/aurora does not already have.reg-namesproperties.apple,always-onandapple,firmware-ownedas on the J714s. The only change to an already-enabled node is that the J714c's FAB1_SOC gainsapple,always-on, which the J714s, K116s and J775d already have.dapf/auxiliary, from the DART instances in the ADT), which the binding requires. That removes the 3reg-namesmessages the J714s already had, and no board gains a message. No new compatibles. The driver behaves the same: it uses adapfwindow only withapple,dapf-ranges, and never usesauxiliary.Still to run (owner rows, per board)
Same four rows on every board. Device numbers come from
v4l2-ctl --list-devices.gst-launch-1.0 filesrc ! parsebin ! v4l2slh264dec|v4l2slh265dec|v4l2slav1dec ! video/x-raw,format=NV12 ! filesink. The output must be bit-exact (md5) withffmpeg -i <clip> -f rawvideo -pix_fmt nv12. Use real content, not test-source clips.gst-launch-1.0 videotestsrc num-buffers=600 ! video/x-raw,format=NV12,width=1920,height=1080,framerate=60/1 ! v4l2h264enc ! h264parse ! mp4mux ! filesink location=ave.mp4. Expect a 10 s file with 600 frames inffprobe. dmesg must show the encoder probing with a known firmware build.tools/asahi/prores-encon the apr0 node.ffmpegmust decode the output.gst-launch-1.0 videotestsrc num-buffers=1 ! video/x-raw,format=NV12,width=1920,height=1080 ! v4l2jpegenc ! filesink location=t.jpgon each of the two JPEG nodes.djpeg t.jpgmust decode.Owners: J714s DjDeveloperr (no-regression only). J714c Eduard Moldovan. J716c erikwb. J716s rolotrealanis98. J775c DjDeveloperr. J775d funkzy. K114c joshuaswarren. K116s axboe. J873s, K114s and K116c have no owner yet.
Dependencies:
drivers/media/platform/apple/ave/ave-drv.c(ave_t6050_builds). No open PR does this.t6050-j775c.dtswith a flattened tree in which these nodes stay disabled. Whichever lands second needs the enables (or the include) carried over.t6050-k116s.dtsfor deep sleep. The values match this file. The text conflicts with the removed decoder block, and resolving it is trivial.Per-board values and DTB diffs
Values: every board's ADT has avd0/dart-avd0, ave0/dart-ave0, apr0/dart-apr0, jpeg0/jpeg1/dart-jpeg0 with the same reg, interrupts, power and clock gates as the J714s (compared across all 11 boards). The node descriptions themselves are unchanged in
t6050-peripherals.dtsiandt6050-ultra.dtsi.Nodes enabled per board (status disabled -> okay unless noted):
ave1, dart-ave1 x2, VENC1_*, apr1, dart-apr1 and PRORES stay disabled on every board.
DTB diffs (decompiled, phandles normalised) are in the branch's build evidence. Each one only flips
statusand addsapple,always-on/apple,firmware-ownedon the nodes above.Assisted-by: LLM (Claude:Opus 5.5)