From 26f6ef618811296e4e19ca210ef08ff4b4283f00 Mon Sep 17 00:00:00 2001 From: Nicolas Nistal Date: Fri, 9 Oct 2026 00:39:15 -0400 Subject: [PATCH] appletbdrm: unpark the T1 panel on resume appletbdrm_t1_park() sets HID feature report 3 to mode 1 at suspend, but resume never set it back. The rearm handshake succeeds and frames are accepted, yet the T1 keeps the panel parked, so the Touch Bar stays dark until a reboot. End the T1 rearm with a report-3 write of mode 2. It runs before the DRM state is restored, so the panel receives fresh frames after the unpark. A failed write takes the existing display-interface reprobe path. The resume fault tests cover the new step. Tested on a MacBookPro14,3 with s2idle. Before this change, report 3 read mode 1 and the panel was dark after every resume. With the change, report 3 read mode 2 after each of 10 timer wakes, and the panel was seen lit after one of them and after a lid close. S3 on the 14,2 is not covered. Refs #18 Co-Authored-By: Claude Opus 5.5 (1M context) --- docs/display-failures.md | 6 +++++ kernel/appletbdrm-t1/appletbdrm.c | 24 +++++++++++++++++++ kernel/appletbdrm-t1/appletbdrm_resume.h | 5 +++- kernel/appletbdrm-t1/test_appletbdrm_resume.c | 10 ++++++-- 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/docs/display-failures.md b/docs/display-failures.md index c82808e..6b8863b 100644 --- a/docs/display-failures.md +++ b/docs/display-failures.md @@ -16,6 +16,12 @@ not an illumination measurement; accepted unpark writes did not relight the reported panels. The next experiment is observation, not another reset or speculative power write. +On a MacBookPro14,3 in s2idle, the panel stayed parked (report 3 mode 1) +after every resume, and an unpark followed by fresh frames relit it. Resume +now ends the rearm with that unpark, before the DRM state is restored. This +was observed on s2idle only; the 14,2 S3 reports above, where the same write +did not relight, remain open. + ## Opt-in reply evidence The following diagnostic records require **v0.1.11 or newer**. They are not diff --git a/kernel/appletbdrm-t1/appletbdrm.c b/kernel/appletbdrm-t1/appletbdrm.c index fd28853..d714fe5 100644 --- a/kernel/appletbdrm-t1/appletbdrm.c +++ b/kernel/appletbdrm-t1/appletbdrm.c @@ -641,6 +641,30 @@ static void appletbdrm_t1_park(struct appletbdrm_device *adev) appletbdrm_clear_display(adev); } +/* + * Undo appletbdrm_t1_park() after system sleep. The T1 keeps the panel parked + * (report 3 mode 1) across resume, and the rearm handshake alone does not + * change that, so the panel stays dark until the mode is set back to 2. + */ +static int appletbdrm_t1_unpark(struct appletbdrm_device *adev) +{ + static const u8 report[15] = { 0x03, 0x02 }; + struct usb_device *udev = adev_to_udev(adev); + u8 *buffer; + int ret; + + buffer = kmemdup(report, sizeof(report), GFP_KERNEL); + if (!buffer) + return -ENOMEM; + + ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x09, 0x21, + 0x0303, APPLETBDRM_T1_HID_INTERFACE, buffer, + sizeof(report), USB_CTRL_SET_TIMEOUT); + kfree(buffer); + + return ret < 0 ? ret : 0; +} + static int appletbdrm_suspend(struct usb_interface *intf, pm_message_t message) { struct appletbdrm_device *adev = usb_get_intfdata(intf); diff --git a/kernel/appletbdrm-t1/appletbdrm_resume.h b/kernel/appletbdrm-t1/appletbdrm_resume.h index 87b30b2..bc460d0 100644 --- a/kernel/appletbdrm-t1/appletbdrm_resume.h +++ b/kernel/appletbdrm-t1/appletbdrm_resume.h @@ -25,10 +25,13 @@ static int appletbdrm_t1_rearm(struct appletbdrm_device *adev) if (ret) return ret; ret = appletbdrm_clear_display(adev); + if (ret) + return ret; + ret = appletbdrm_clear_display(adev); if (ret) return ret; - return appletbdrm_clear_display(adev); + return appletbdrm_t1_unpark(adev); } static int appletbdrm_resume(struct usb_interface *intf) diff --git a/kernel/appletbdrm-t1/test_appletbdrm_resume.c b/kernel/appletbdrm-t1/test_appletbdrm_resume.c index 23f6ab5..61d2c20 100644 --- a/kernel/appletbdrm-t1/test_appletbdrm_resume.c +++ b/kernel/appletbdrm-t1/test_appletbdrm_resume.c @@ -6,9 +6,9 @@ #include #include -enum step { CLEAR_OUT, CLEAR_IN, INFORMATION, READINESS, CLEAR, RESTORE }; +enum step { CLEAR_OUT, CLEAR_IN, INFORMATION, READINESS, CLEAR, UNPARK, RESTORE }; static const enum step recovery[] = { - CLEAR_OUT, CLEAR_IN, INFORMATION, READINESS, CLEAR, CLEAR, RESTORE, + CLEAR_OUT, CLEAR_IN, INFORMATION, READINESS, CLEAR, CLEAR, UNPARK, RESTORE, }; static enum step observed[sizeof(recovery) / sizeof(recovery[0])]; static size_t calls, fail_at, errors; @@ -77,6 +77,12 @@ static int appletbdrm_clear_display(struct appletbdrm_device *adev) return perform(CLEAR); } +static int appletbdrm_t1_unpark(struct appletbdrm_device *adev) +{ + (void)adev; + return perform(UNPARK); +} + static int drm_mode_config_helper_resume(struct drm_device *drm) { (void)drm;