Repository navigation
[Intel Mac P11] Consolidate model-specific Cirrus audio support - #12689
andrew-boyd wants to merge 8 commits into
Conversation
Consolidate existing source contributions for draft review. Original implementation authors are retained as author/co-authors; the committer assembled and reconciled the candidate. No contributor approval or sign-off is implied. Known defects and excluded alternatives remain documented in the PR body. Source-PR: omacom#9516 Source-PR: omacom#6921 Source-PR: sunoxen-lab#1 Source-PR: omacom#10458 Source-Commit: omacom#9516ff83da9 Source-Commit: omacom#9516ad69a65 Source-Commit: omacom#9516db6d259 Source-Commit: omacom#6921316e1f0 Source-Commit: omacom#69210345c98 Source-Commit: omacom#69212d7cbf6 Source-Commit: sunoxen-lab#13fd681d Source-Commit: sunoxen-lab#13f64870 Source-Commit: sunoxen-lab#1579cef0 Source-Commit: omacom#104585cf2638 Co-authored-by: J7 <31825378+j7j7@users.noreply.github.com> Co-authored-by: S-M Robinson <seanmichael@hey.com> Co-authored-by: David Heinemeier Hansson <david@hey.com> Co-authored-by: Jake Pillai <jakepillai@me.com> Co-authored-by: inspiretelapps <207020073+inspiretelapps@users.noreply.github.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
|
Reviewing
These are source-review findings; I have not run an offline ISO installation, a DKMS build, or an audio-session test for this revision. |
omacom/omarchy#12689 (draft) plus omacom/omarchy-pkgs#249 would install davidjo's snd-hda-macbookpro-dkms on iMac18,x/19,x. It registers as snd_hda_macbookpro/0.1 -- our DKMS name, another version -- and audio_rival_dkms skipped every entry with our name, so the clash went unnoticed until a kernel update let the wrong build win updates/dkms (no headset capture, no remote buttons). - audio_rival_dkms reports our name with any other version, plus any other package building snd-hda-codec-cs8409, as before - a rival whose source tree a pacman package owns is removed with pacman -R; deleting its files left the package registered, and its next upgrade restored them - mod_audio_detect reports partial while a rival exists, so the status banner flags it right after the Omarchy update, before a kernel update - the 0.2 version lives in one constant, AUDIO_DKMS_VER; AUDIO_SRCROOT makes the source root overridable for testing Tested against a fake source root (ours only; plus davidjo 0.1; plus an other-named cs8409 driver; plus unrelated APFS DKMS) and on the live machine (no rival, audio still "applied"). The pacman -R branch is not exercised live: that needs the rival package installed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
A heads-up from an iMac18,3 owner on how this lands on machines that already have a CS8409 driver. Until now, building it by hand was the only way to get sound on these Macs, so many will. The install hook and migration
Suggestion: skip the install when |
|
Two of the earlier review points look like they're still open at the current head, and both can break
The branch also conflicts with |
|
Author of #11064 here. I have a physical MacBookPro13,2 (CS8409 + MAX98706) and can run attended tests of the CS8409 track: fresh install, the migration on an existing install, and speakers after a reboot and a kernel update. One thing I'd like to see before testing: the existing-install guard @ahmadtv and @jandrusk described. Many 13,x/14,x owners (me included) previously built davidjo's driver by hand, so the migration would currently fail for us with "exists in filesystem". On my side I don't mind which of #11064 and this lands; I'd just like one of them to unblock these Macs. |
|
A data point for the CS4208 / 12-inch MacBook part of this, from a MacBook10,1: Installing the out-of-tree An alternative that gives you both, on the stock driver: https://github.com/martin-irwin/macbook12-cs4208-audio
It's tested on one MacBook10,1 (kernel 7.2.15). I'm happy to help adapt it into a hardware script here if that's useful. |
[Intel Mac P11] Consolidate model-specific Cirrus audio support
Consolidate the separate Cirrus audio tracks while keeping their model and package boundaries. Software follow-ups anchor the CS8409 model gate, avoid an unrelated stock-header request, preserve custom service/user configuration and back up saved routes. Driver and mixer tuning are unchanged.
Draft consolidation for source review and hardware-owner follow-up. Known defects remain; no hardware or merge-readiness certification is claimed. Part of the 14-feature Intel Mac series with three package companions.
Contribute: open follow-up PRs in
andrew-boyd/omarchywith baseintel-mac/p11-cirrus-audio. Use[Intel Mac P11]in the title and a contributor branch such asintel-mac/p11/describe-change. Link this feature in the series index. Merging a follow-up into this branch updates its roll-up.This existing draft: #12689.
Full Intel Mac scope and current revision
The project covers all 64-bit Intel Macs: pre-T1, T1 and T2. MacBookPro13,3 is only the first available physical test machine. Each feature has its own hardware boundary; one model's success does not validate the rest.
Candidate head:
718268634ed323174a43c2b83690af921019bd83; reconciled upstream:8f324c90b82790d31ab33565441e07cbdb8d2308. Published contribution commits and author/co-author metadata remain in the history.Ready for attended physical testing; Mac hardware remains untested by this effort. The reconciled combined ISO passed fresh unencrypted/encrypted VM installations, desktop/password-lock checks, strict Neovim startup/theme checks, synthetic Apple EFI preservation through a disk wipe, and affected package/DKMS/migration checks. ISO SHA-256:
9e6288ef5cc1eadce519cdd7384c8030286eb938a6288eb218f025a61b433252.Exact sources, results, retained failures and reproduction. These results cover the pinned combined image; standalone-versus-combined differences remain explicit. Full inventory and retained work tracks.
Scope and dependencies
Preserve separate CS8409, MacBook CS4208 and iMac CS4208 tracks. The two DKMS package tracks conflict on one machine. Source closures do not erase iMac coverage or the MacBookPro13,2 speaker report.
The inventory now records 188 source/context PRs: 101 have dispositions in feature tables and 87 remain only in separate work tracks. This is not 188 implemented PRs or 188-to-14 compression. The 14 feature PRs and three package companions remain the published coordination targets; retained backlog is not claimed complete.
Every affected source PR and recommended action
Current open/closed/merged state is administrative history, not proof that two patches preserve identical behavior. Included/partial identifies selected contributions; alternatives, deferred work and context are not automatically ISO content.
Validation and attribution
Required fresh-image checks are satisfied, with qualified reruns. The full source suite passed 273 files with two disclosed skips, but repeated NetworkManager Polkit failures during that suite temporarily locked its test account. The following password/desktop/recovery checks failed there and passed separately in a clean overlay of the same ISO; the original aggregate remains failed. The first build attempt also failed one libfprint USB-emulation test; unchanged-source isolated repeats, two complete suites and normal package checks passed afterward. That intermittent build-test failure remains documented, and its cause is not established. VM fixtures and DKMS builds do not establish physical device behavior. Physical Wi-Fi, audio, camera, Touch Bar, fingerprint, graphics and suspend behavior remain unverified by this effort.
Original source histories remain linked above. Source-authored commits already included in the roll-ups remain ancestors of this revision; additional copied contributions receive native attribution. Original attribution mapping. No original PR is edited or closed by this effort.