Repository navigation
Rebind the T1 Touch Bar's display sub-device so it doesn't stay dark - #7950
csk-grit42 wants to merge 1 commit into
Conversation
apple-ib-tb spawns a virtual HID sub-device (1D6B:0301) once the iBridge's 05AC:8600 interfaces are bound to apple-ibridge-hid. That sub-device carries the "display on" field but doesn't reliably win its own auto-bind race, so the bar shows icons but stays dark. Complements omacom#7064, which installs the driver and binds the two real interfaces but not this one.
There was a problem hiding this comment.
Pull request overview
Adds T1 Touch Bar display rebinding for boot and resume events.
Changes:
- Adds a udev-triggered HID rebinding command.
- Installs the rule on fresh and existing systems.
- Adds shell coverage for detection, binding, and installation.
Tip
If you aren't ready for review, convert to a draft PR.
Click "Convert to draft" or run gh pr ready --undo.
Click "Ready for review" or run gh pr ready to reengage.
Reviewed changes
Copilot reviewed 6 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
bin/omarchy-hw-apple-t1-touchbar-disp-bind |
Rebinds the virtual display HID device. |
default/udev/apple-t1-touchbar-disp.rules |
Triggers rebinding on iBridge enumeration. |
install/hardware/apple/t1-touchbar-disp-bind.sh |
Provides detection and installation helpers. |
install/hardware/apple/fix-t1-touchbar-disp-bind.sh |
Adds the installer hook. |
install/hardware/all.sh |
Runs the new hardware hook. |
migrations/1787508990.sh |
Installs the rule on existing systems. |
test/shell.d/apple-t1-touchbar-disp-bind-test.sh |
Tests detection, rebinding, and wiring. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
|
Reviewed at c391c2e against What ran. On a disposable Omarchy worker, It does nothing on The trigger can miss the sub-device. Both reviews reached this; the second opinion agreed, and its independence is not guaranteed.
The test's already-bound and gives-up-in-time cases would still pass if the guard they check were removed, so they do not cover the two cases above. What happens next. Nothing was pushed: the trigger is a design change that needs T1 hardware to prove, and this pull request's value depends on #7064. It waits on the maintainer's decision about the T1 driver direction. If that goes to #7064, the fix above, and a maintainer confirming it on a T1 machine at the new head, are what would make it ready. |
Why
On T1 Touch Bar MacBook Pros (
MacBookPro13,2/13,3/14,2/14,3), onceapple-ib-tbis loaded and the iBridge's05AC:8600HID interfaces are bound toapple-ibridge-hid, the driver spawns a second, virtual HID sub-device (1D6B:0301) carrying the "display on" field. The bar's icon row can already be lit at this point, but the bar itself stays completely dark until that sub-device is also explicitly bound, this time toapple-ib-touchbar. It does not reliably win its own auto-bind race, and nothing logs the failure. The whole chain re-enumerates on resume too, so this triggers off USB add rather than module add.This is additive to #7064, which installs the driver stack and binds the two real
05AC:8600interfaces, but does not yet rebind the virtual sub-device — a T1 Touch Bar can still ship dark even with that fix applied. This PR only adds the missing rebind; it needs a T1 Touch Bar driver already present to have anything to act on.Diagnosed and field-verified (Part 2 of the linked recipe) on a MacBookPro14,2: csk-grit42/OmarchyOnMacBookPro14.2-2017---A1706- — HOWTO.md.
What
bin/omarchy-hw-apple-t1-touchbar-disp-bind— force-binds the1D6B:0301sub-device toapple-ib-touchbaronce it appears (short retry loop; it's spawned asynchronously right after the parent bind).default/udev/apple-t1-touchbar-disp.rules— runs it on every05AC:8600USB add, covering boot and resume.install/hardware/apple/t1-touchbar-disp-bind.sh— sharedneeded/installed/installhelpers for the leaf hook and migration.install/hardware/apple/fix-t1-touchbar-disp-bind.sh— install-time hook, wired intoinstall/hardware/all.shright after the SPI keyboard hook.1787508990does the same for existing installs.test/shell.d/apple-t1-touchbar-disp-bind-test.shcovers the hardware gate, the rebind logic against a faked/sys/bus/hidtree, and the install/migration wiring.No change to
manual/44-mac-support.md— the Touch Bar isn't fully wired up onquattrowithout #7064 (or an equivalent driver install) landing first; this only removes the second failure mode once that's in place.Test plan
./test/clitest/shell.d/apple-t1-touchbar-disp-bind-test.sh