Repository navigation
drm/apple: Give a sink with a fast preferred mode a firmware-derived EDID - #1643
Draft
DjDeveloperr wants to merge 1 commit into
Draft
DjDeveloperr wants to merge 1 commit into
DjDeveloperr wants to merge 1 commit into
Conversation
…EDID The firmware-derived EDID's detailed timing is the sink's preferred mode, or its best-scored IsPreferred timing. An EDID detailed timing holds at most 655.35 MHz, so a sink whose preferred mode is faster got no EDID at all: dcp_metadata_timing() refused the mode, and the connector had none. On the M5 Pro that is the Odyssey G81SF, preferred 3840x2160@120 at 1188 MHz, whose DisplayAttributes parse fine (PQ included). Without an EDID, compositors keep it in sRGB and offer no HDR. Pick the detailed timing only among the timings it can hold, the preferred one first and then the best-scored. A sink's own EDID does the same, listing faster modes in extensions. DRM's modes come from the firmware's timing catalog either way. Signed-off-by: Diljit Singh <hey@djdev.me>
Contributor
|
Blockers: 1.
HW row: none for this PR; the open item is the G81SF (3840x2160@120) on the M5 Pro getting an EDID with HDR static metadata on the merged code. Assisted-by: LLM (Claude:Opus 5.5) |
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.
What
Give a sink whose preferred mode is faster than an EDID detailed timing can hold a firmware-derived EDID, instead of none.
The firmware-derived EDID's detailed timing is the sink's preferred mode, or failing that its best-scored IsPreferred timing. An EDID detailed timing holds at most 655.35 MHz. For a faster preferred mode,
dcp_metadata_timing()refused the timing and no EDID was built at all.On the M5 Pro that sink is the Odyssey G81SF, whose preferred mode is 3840x2160@120 at 1188 MHz. Its DisplayAttributes parse fine (
seen 0x1f, PQ supported), but its connector had no EDID. Without one, compositors keep it in sRGB and offer no HDR (Hyprland listed it with an empty description).The fix:
dcp_firmware_metadata_timing()now picks the detailed timing only among timings that slot can hold: the preferred one first, then the best-scored. A sink's own EDID does the same, listing faster modes in extensions. DRM's modes come from the firmware's timing catalog either way.dcp_metadata_timing_fits()is split out ofdcp_metadata_timing()and covers its checks except the image size.Status: draft until tested
appledrm.koon the default kernel's tree (7.3.0-m5-intg4, f1b79c4), applied alone onto intg4's apple directory: no errors, and no warnings from this change. The kunit file is not in that config; host-tests will build and run it.🤖 Generated with Claude Code