Repository navigation
arm64: dts: apple: t604x-j614-j616: scale the 720p camera preset - #1005
Merged
RyanTheTide merged 1 commit intoNov 6, 2026
Merged
Conversation
The 1280x720 preset cropped the top-left 1280x720 corner of the 1920x1080 window that firmware configuration 5 delivers, without scaling. A 720p stream, which video calls often ask for, therefore showed an off-centre view about two thirds as wide as the 1080p one. Crop the whole 1920x1080 window and let the scaler bring it down to 1280x720, as the driver already does for the sizes it derives itself (such as 640x480 from the 1080p crop). The driver offered P010 only for presets whose crop equals their output, so the scaled preset would lose it and a 1280x720 P010 request would fall back to 1280x960. Accept a crop at the origin with the output's aspect ratio that is no smaller than the output instead. Signed-off-by: Jonathan Goyvaerts <jonathan.goyvaerts@gmail.com> Assisted-by: LLM
Contributor
|
Merge train (MTR, 06/11): merging. I reviewed it. The DT change only touches the J614/J616 IMX958 720p preset, and the new P010 test still requires a crop at the origin with the output's aspect ratio. On the J616s the 720p stream is now the whole 1080p window scaled down, and P010 720p still streams (above). The IMX558 and IMX364 presets on M1/M2 have the same shape, but P010 there stays behind Gates: test merge 2d3579ef = integration/aurora 11eccbe + #1005 #994 #930 #658 #992 #1006 #1007 #1008 #531 (#992 has since landed on its own); base 11eccbe.
Hardware (7.3.0-aurora-mtr1106a, one-shot boots, fleet recipe):
|
This was referenced Nov 6, 2026
AxxzyWasTaken
added a commit
to AxxzyWasTaken/linux
that referenced
this pull request
Nov 7, 2026
The 720p preset cropped 1280x720 out of the top left of the 1920x1080 frame instead of scaling the whole frame, as aurora-silicon#1005 fixed for the other boards. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
This was referenced Nov 7, 2026
RyanTheTide
pushed a commit
that referenced
this pull request
Nov 10, 2026
iBoot places the ISP firmware differently on each boot here, so the J616s placement does not hold. The loader fills the firmware regions from the ADT, so add them as placeholders with the J616s addresses and enable the ISP: its alias, which aura needs to open the DAPF, the firmware regions and heap, the node with its platform ID, camera connection scheme and two IMX958 presets (the 720p one keeps the full frame, as #1005 did for the other boards), and the three DARTs. This goes in the J616c board file, not in t6041-j614c-j616c.dtsi: there is no J614c ADT yet, so its camera setup is unchecked. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.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
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.
The J614/J616 1280x720 sensor preset cropped
<0 0 1280 720>out of the 1920x1080 window that firmware configuration 5 delivers, without scaling. A 720p stream, which browsers and video calls often ask for, showed the top-left corner of the picture: an off-centre view about two thirds as wide as 1080p.This crops the whole 1920x1080 window and lets the scaler bring it down to 1280x720, as the driver already does for the sizes it derives itself (640x480 from the 1080p crop).
With only the DT change, the 720p preset loses P010:
isp_ch_cache_sensor_configsaccepted a preset for P010 only when its crop equalled its output, so a 1280x720 P010 request fell back to 1280x960. The P010 test now accepts a crop at the origin with the output's aspect ratio that is no smaller than the output. OnlyCH_CROP_SCL1_SETuses the crop; the buffers are sized from the output.Tested on a J616s (M4 Pro, IMX958), on our tree with the same diff:
VIDIOC_S_FMTkeeps 1280/720 for both, and no ISP errors show in the log.isp-cam.chunk, a 1280x720 P010 request came back as 1280x960.