<marcan>
_jannau_: cherry-picked on the respective branches, going to rebase on rc6 now and run a build and make some OS builds
<marcan>
sven: will do
beeblebrox has joined #asahi-dev
bisko has quit [Quit: My MacBook has gone to sleep. ZZZzzz…]
<marcan>
plan is to write post & release tomorrow
<marcan>
asahi-6.1-rc6-1 tagged and pushed
<sven>
you can drop 73d651c07433712e97cb0c7121e8d50492397639 since 6d8fc203b28ff8f6115fbe5eaf584de8b824f4fa is upstream now fwiw
<marcan>
sven: ack, dropped
<marcan>
any reason to respin? should be harmless right?
<sven>
it's completely harmless
<marcan>
ok, will go into the next rev if there is one before release, otherwise shrug
<sven>
they both do the same thing, my patch is just the minimal possible change because the more complex rework confused people on the ML
<marcan>
yeah
<sven>
and apparently the author never followed up anyway *shrug*
bisko has joined #asahi-dev
StupidYui has joined #asahi-dev
beeblebrox has quit [Quit: Konversation terminated!]
<marcan>
I'm getting an oops in platform_dma_configure on m2, possibly in the dcp driver iommu path
<marcan>
any idea what's up with that?
<marcan>
_jannau_: ^
<marcan>
looks like a memset in alloc_io_pgtable_ops?
<_jannau_>
did you merge the m2-dcp changes completely?
<marcan>
I *think* so but I might've snafu'd something
<_jannau_>
ah, sorry those are quite WIP so I didn't think there are ready
<marcan>
oh
<marcan>
oh I misread your message, you said merge the M2 DCP changes *later*
<marcan>
oops.
<marcan>
as in after the release
* marcan
pulls out git reflog
<_jannau_>
yes, changed handling of locked darts is not really ready
<_jannau_>
do you have the m1n1 changes for M2 DCP support?
<marcan>
oh, then yeah that would be the other part of the problem
<marcan>
_jannau_: is the 36bit dma mask change harmless enough to leave in?
<_jannau_>
marcan: it should be and I tested on t6002 but only briefly. iova space will be limited by the 32-bit aperture we set in apple-dart.c anyway
<marcan>
ok, cool
<marcan>
Tagging and pushing asahi-6.1-rc6-2 with backed out DART changes & DT for t8112
<marcan>
povik: around?
beeblebrox has joined #asahi-dev
lewurm has quit [Quit: ZNC 1.8.2+deb2build5 - https://znc.in]
lewurm has joined #asahi-dev
bisko has quit [Quit: My MacBook has gone to sleep. ZZZzzz…]
jlco has quit [Ping timeout: 480 seconds]
<marcan>
ok, bumped the ucm stuff and pulseaudio again to override upstream, looks like the headphone jack does what it's supposed to on an updated M2
<marcan>
_jannau_, sven, povik: last call before I kick off some image builds
<sven>
should be fine. anything updates I have are unstable at best
<sven>
*any
<_jannau_>
marcan: do you have the mac studio (mac mini) ucm config fix from povik's repo?
<marcan>
yes, I updated to v1
<marcan>
haven't tested it but it should be there
<_jannau_>
ok, nothing else from my side
<_jannau_>
I tested it on the mac studio
<_jannau_>
mini should be ok since the speaker is not disabled
rowanG337 has joined #asahi-dev
<marcan>
audio definitely does not play terribly nicely with suspend/resume, you get a momentary looped-buffer glitch on suspend and on resume the headphones jack is dead until a hotplug (at least with PA)
<marcan>
but at least it does come back after a hotplug, so no major loss
jlco has joined #asahi-dev
<kettenis_>
ah, that reminds me, need to test how well that works under OpenBSD now that I have suspend/resume (mostly) working
<marcan>
sven: FYI, given the state of lina's GPU stuff, the only thing stopping me from daily driving this as my main asahi machine at this point is thunderbolt
<marcan>
juuuust saying ;)
<sven>
no worries, i'm on it :D
<sven>
same situation here tbh
<sven>
I think I know how to bring TB up
<sven>
just need to find some annoying bug somewhere that makes part of the MMIO still SError
<sven>
dp-over-tbt is probably the biggest part that I still have no idea about
<sven>
but I need tbt itself up before that anyway
<sven>
just need to finish this small adventure into USB PD and drivers/usb/typec and clean the DP altmode stuff up before
<sven>
it kinda works. just need to ignore lockdep complaining about a possible deadlock and the missing calls to the usb role switch which makes atcphy WARN
<_jannau_>
I've already switched to the m1 max macbook as main laptop in september and suffered with dcp but without gpu driver. For tha mac studio I need at least dp-altmode since hdmi 2.0 is not sufficient to drive my display
<sven>
i might just suffer for a while replugging cables and use this usb3+dp hub with my macbook air
<marcan>
I don't actually block on dp-over-tbt, funny enough (though it will be a funny port situation dedicating one port to firewire, but doable)
<_jannau_>
dcpext init seems to work a lot better if I keep the monitor on via osd after plugging it in
cylm has joined #asahi-dev
<_jannau_>
i.e. if the monitor timeouts during dcpext init dcpext gets confused and can not reacitivate the link
<sven>
I mostly block on dp-over-tbt because I don't want to switch setups between $work and my macbook
<sven>
it's probably not that bad anyway once tbt is up (famous last words and all that)
bisko has joined #asahi-dev
<marcan>
:D
gpanders has left #asahi-dev [WeeChat 3.7.1]
MajorBiscuit has quit [Ping timeout: 480 seconds]
roxfan2 has joined #asahi-dev
roxfan has quit [Ping timeout: 480 seconds]
tobhe has joined #asahi-dev
tobhe_ has quit [Ping timeout: 480 seconds]
<marcan>
building images again because of course things broke with the asahi-scripts changes...
roxfan2 is now known as roxfan
<povik>
marcan: here
<marcan>
povik: can I get another invite to the ucm repo so I can try to move it? I cloned it but I'm not sure if you prefer a move
<povik>
i prefer a move
<povik>
let's see...
<povik>
marcan: invite sent
<marcan>
povik: looks like that gives me push access, is there a way to make me owner/similar so I can try the move stuff in settings?
<povik>
lookiong
<povik>
*looking
<marcan>
oh wait, maybe this is the flow
<marcan>
you can initiate a transfer to my *personal* account
<marcan>
that should be acceptable by me
<povik>
haha, let's try it
<marcan>
then I should be able to move it into the org
<sven>
alright, just the lockdep issue remaining but otherwise altmode now correctly works with the typec subsystem :)
MajorBiscuit has quit [Quit: WeeChat 3.6]
Dcow has quit []
Dcow has joined #asahi-dev
<jannau>
so someone has to look into dynamic connector <-> crtc/dcpext linking? not sure how well that will work
<jannau>
I think drm expects that available modes/edid are already avaiable at the connector level
<jannau>
marcan: 3 installs without installation related problems. devices: j274, j314c, j375d, macOS: 12.3, 13.0, 12.3 1tr, all into free space, 1 expert mode install
<sven>
hrm, so we’ll have three connectors per dcpext
<sven>
if we get a hotplug event can we just assign a connector to a dcpext and bring it up enough to get the edid and only then let drm know?
<jannau>
upgraded all asahi installs to the latest asahi-dev (from asahi-dev) without issues
<sven>
we’ll also have to rewrite the oob hpd thingy so that there’s no race between tipd and drm probe
<jannau>
marcan: one post install issue: audio is broken when starting firefox with headphones connected, replugging the headphones fixes it
jluthra has quit [Remote host closed the connection]
jluthra has joined #asahi-dev
<jannau>
I was thinking of the somewhat constructed case of connecting a second display to a m1 device but I guess switching from that was always going to be problematic
<sven>
yeah, that case is always going to be an issue
<sven>
I still have to check and see if I can hack dual display support but I actually don’t have two displays around right now
<jannau>
how the the oob hotplug supposed to work? ensuring probe order via device links?
<sven>
probably similar to usb-role-switch
<jannau>
I'm not really happy about all those static dependencies, especially since there were 2 m1 mbp 13" where booting dcpext failed
<sven>
or maybe just caching the state if tipd probes first
<sven>
and caching the callback if drm probes first so that it just doesn’t matter
<sven>
haven’t really thought about it
<sven>
it also doesn’t matter much yet since the only issue right now is that you just can’t have the display connected at boot time if you want it to work reliably
bisko has quit [Read error: Connection reset by peer]