New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

M2+ desktop dcp/dptx HDMI output support #329

Merged

marcan merged 21 commits into AsahiLinux:main from jannau:m2_dptx_v13_5

Oct 5, 2023

Member

jannau commented Sep 3, 2023 •

edited

Loading

Initialize the HDMI output of M2+ desktop Macs releases in 2023.

Mac mini (M2/M2 Pro) and Mac studio (M2 Max) should work (tested on both mini models)
Mac Pro / studio (M2 Ultra) are different but I would expect it to work as well
only one HDMI port on the Mac Pro works (the one driven by die 1), no idea which
high res displays might not work if they require different phy parameters

jannau force-pushed the m2_dptx_v13_5 branch from 716e435 to d82b20c Compare

September 5, 2023 06:58

sequencer commented Sep 6, 2023

I'm curious, is this work also help DP Alt for laptops?

jannau force-pushed the m2_dptx_v13_5 branch 4 times, most recently from dc81c87 to 340ea0d Compare

September 11, 2023 07:03

niggowai commented Sep 17, 2023

I can confirm it working for my j473 with a 13.5 IPSW.
Unfortunately, linux turns off the dptx again

Member Author

jannau commented Sep 17, 2023

I can confirm it working for my j473 with a 13.5 IPSW. Unfortunately, linux turns off the dptx again

yes, linux need further changes not turn the dptx-phy power domain off. You can add pd_ignore_unused to the linux kernel command line to avoid that or add apple,always-on to the dptx_ext_phy power state.

jannau added 20 commits

September 20, 2023 21:28


          display: Use dcp iboot SetSurface instead of SwapLayer

988c1c8

iboot uses this and it's simpler. m1n1 doesn't need to swap surfaces
for tear free display.

Signed-off-by: Janne Grunau <j@jannau.net>


          rtkit: Add rtkit_can_recv()

6b24255

Required non-blocking handling of multiple AFK endpoints for the same
mailbox.

Signed-off-by: Janne Grunau <j@jannau.net>


          dart: limit vm-base to 36-bit io address space

b157803

Required for t602x dcp*.

Signed-off-by: Janne Grunau <j@jannau.net>


          dcp/parser: Add parser from linux DCP required for parsing dcp AFK/EPIC

5a939c6

Signed-off-by: Janne Grunau <j@jannau.net>


          dcp: Add (lp)dptx-phy support for M2* desktops

16af849

Phy "implementation" is simplified a replay of a macos trace with on
t8112 with a 1920x1080 display.

Signed-off-by: Janne Grunau <j@jannau.net>


          dcp: dptx-phy: rewrite dptx_phy_activate() for dptx/lpdptx-phy

a1ac36e

Signed-off-by: Janne Grunau <j@jannau.net>


          dcp: dptx-phy: make dptx_phy_set_link_rate() SoC independent

74f427b

Signed-off-by: Janne Grunau <j@jannau.net>


          afk: Sync structs/names with proxyclient's python definitions

ab72df1

Signed-off-by: Janne Grunau <j@jannau.net>


          afk: Prepare afk/epic for handling of multiple endpoints

6a2bbbd

This needs to ensure that the data processing does not block on
message retrieval from the mailbox. Command processing must not block
and have to ensure that afk_epic_command() receives the reply to its
command.
DCP's dptx-port endpoint (endpoint 0x2a) can send notifies at any time
which needs to be processed in the right context.

Signed-off-by: Janne Grunau <j@jannau.net>


          afk: Fix a NULL pointer dereference in adfk_epic_send()

32881dc

Signed-off-by: Janne Grunau <j@jannau.net>


          afk: Introduce EPIC services

aebaa1c

To be used on the dptx-port endpoint.

Signed-off-by: Janne Grunau <j@jannau.net>


          afk: use increasing EPIC sequence numbers

b9b0755

Signed-off-by: Janne Grunau <j@jannau.net>


          afk: Add EPIC std services IOp -> AP calls

26fa229

Used on dptx-port endpoint.

Signed-off-by: Janne Grunau <j@jannau.net>


          afk: epic channel/interface numbers do not reset

6f4cc40

They exceed 256 with repeated chainloading of m1n1.bin on j473. Do not
hold a service for every possible channel but keep a fixed array of 8
services identified by the channel number.

Signed-off-by: Janne Grunau <j@jannau.net>


          dcp: Do not use an anonymous struct for dcp_dev_t typedef

ac32c0e

This allows forward declarations in other headers.

Signed-off-by: Janne Grunau <j@jannau.net>


          dcp/dptx: Add dptx-port endpoint

20442d3

Based on the linux kernel implementation with updates for the macOS 13.5
based DCP firmware.

Signed-off-by: Janne Grunau <j@jannau.net>


          dcp/dpav: Add DPAV endpoint

Signed-off-by: Janne Grunau <j@jannau.net>


          dcp/system: Add system endpoint

7c99be9

This on is boring but allows turning additional logging on.

Signed-off-by: Janne Grunau <j@jannau.net>


          rtkit: Support usage with SRAM

327ce34

Will be used by SMC.

Signed-off-by: Janne Grunau <j@jannau.net>


          smc: Add minimal smc client

075267e

Only supported operation is smc_write_u32() for turning the dp2hdmi
converter on M2 desktop systems on.

Signed-off-by: Janne Grunau <j@jannau.net>

jannau force-pushed the m2_dptx_v13_5 branch from 340ea0d to ff1a4dd Compare

September 20, 2023 19:29


          display: Support the HDMI output on M2* desktop systems

ae41be1

On M2* desktop systems the HDMI output is not managed by dcp/dcp0. This
allows more flexibility, for example dcp on the M2 Mac mini can be
routed to the USB-C/ThunderBolt ports.
For m1n1 this adds quite ab bit of complexity. In addition to the DCP
iboot endpoint/protocol two additional endpoints have to be started.
Only the dptx-port endpoint has a meaningful AP <=> DCP communication.
In addition we start the system endpoint to optionally enable more
verbose syslog messages (if RTKIT_SYSLOG is defined).
In addition the dptx-phy or lpdptx-phy has to be programmed. Those two
phy look mostly identical. MacOS seems to use a static DP configuration
(4 lanes, HBR3*) regardless of the connected display.
The added SMC gpio support is used to power the MCDP29xx DP to HDMI
converter on.
Config  is unfortunately a mess since Apple can't name the device tree
nodes consistently. On M2 Ultra devices only the four dcpext*/dispext*
on each die are used. M2 Ultra support is untested.

* link rate might differ on t602x based devices for 8k60 support

Signed-off-by: Janne Grunau <j@jannau.net>

jannau force-pushed the m2_dptx_v13_5 branch from ff1a4dd to ae41be1 Compare

September 22, 2023 18:45

marcan merged commit 31ee149 into AsahiLinux:main

3 checks passed

3405691582 mentioned this pull request

No display over HDMI-out on M2 Mac Mini (j473ap) #342

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet