From b11c4bee2a51ee5d558707da4554c44d1c59adb3 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Mon, 27 Apr 2026 11:32:04 +0530 Subject: [PATCH] 7.1 --- 2008-i915-4-lane-quirk-for-mbp15-1.patch | 2 +- 4001-asahi-trackpad.patch | 11 +++--- ...-the-keyboard-backlight-is-off-if-su.patch | 39 ------------------- version | 2 +- 4 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 4002-HID-apple-ensure-the-keyboard-backlight-is-off-if-su.patch diff --git a/2008-i915-4-lane-quirk-for-mbp15-1.patch b/2008-i915-4-lane-quirk-for-mbp15-1.patch index c5d8031..a9dd8e0 100644 --- a/2008-i915-4-lane-quirk-for-mbp15-1.patch +++ b/2008-i915-4-lane-quirk-for-mbp15-1.patch @@ -64,9 +64,9 @@ index cafdebda7..a5296f827 100644 --- a/drivers/gpu/drm/i915/display/intel_quirks.h +++ b/drivers/gpu/drm/i915/display/intel_quirks.h @@ -20,6 +20,7 @@ enum intel_quirk_id { - QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK, QUIRK_FW_SYNC_LEN, QUIRK_EDP_LIMIT_RATE_HBR2, + QUIRK_DISABLE_EDP_PANEL_REPLAY, + QUIRK_DDI_A_FORCE_4_LANES, }; diff --git a/4001-asahi-trackpad.patch b/4001-asahi-trackpad.patch index 64718ca..e798e68 100644 --- a/4001-asahi-trackpad.patch +++ b/4001-asahi-trackpad.patch @@ -219,20 +219,19 @@ later Magic Keyboards. Signed-off-by: Janne Grunau --- - drivers/hid/Kconfig | 2 +- + drivers/hid/Kconfig | 1 + drivers/hid/hid-apple.c | 15 +++++++++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) + 2 files changed, 16 insertions(+) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig -index c1d9f7c6a..1bcb8a569 100644 +index ff2f580b660ba6..af03f6c31614df 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig -@@ -140,7 +140,7 @@ config HID_APPLE +@@ -139,6 +139,7 @@ config HID_APPLE tristate "Apple {i,Power,Mac}Books" depends on LEDS_CLASS depends on NEW_LEDS -- default !EXPERT -+ default !EXPERT || SPI_HID_APPLE ++ default SPI_HID_APPLE help Support for some Apple devices which less or more break HID specification. diff --git a/4002-HID-apple-ensure-the-keyboard-backlight-is-off-if-su.patch b/4002-HID-apple-ensure-the-keyboard-backlight-is-off-if-su.patch deleted file mode 100644 index 5d5fe19..0000000 --- a/4002-HID-apple-ensure-the-keyboard-backlight-is-off-if-su.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 478b065d50e4d82c1c990a53d03a2dd1002eb0ad Mon Sep 17 00:00:00 2001 -From: Aditya Garg -Date: Fri, 3 Apr 2026 15:14:47 +0000 -Subject: [PATCH] HID: apple: ensure the keyboard backlight is off if - suspending - -Some users reported that upon suspending their keyboard backlight -remained on. Fix this by adding the missing LED_CORE_SUSPENDRESUME flag - -Reported-by: André Eikmeyer -Tested-by: André Eikmeyer -Signed-off-by: Aditya Garg ---- - drivers/hid/hid-apple.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c -index fc5897a6b..2eb45fac8 100644 ---- a/drivers/hid/hid-apple.c -+++ b/drivers/hid/hid-apple.c -@@ -858,6 +858,7 @@ static int apple_backlight_init(struct hid_device *hdev) - asc->backlight->cdev.name = "apple::kbd_backlight"; - asc->backlight->cdev.max_brightness = rep->backlight_on_max; - asc->backlight->cdev.brightness_set_blocking = apple_backlight_led_set; -+ asc->backlight->cdev.flags = LED_CORE_SUSPENDRESUME; - - ret = apple_backlight_set(hdev, 0, 0); - if (ret < 0) { -@@ -926,6 +927,7 @@ static int apple_magic_backlight_init(struct hid_device *hdev) - backlight->cdev.name = ":white:" LED_FUNCTION_KBD_BACKLIGHT; - backlight->cdev.max_brightness = backlight->brightness->field[0]->logical_maximum; - backlight->cdev.brightness_set_blocking = apple_magic_backlight_led_set; -+ backlight->cdev.flags = LED_CORE_SUSPENDRESUME; - - apple_magic_backlight_set(backlight, 0, 0); - --- -2.52.0 - diff --git a/version b/version index 3147364..2758158 100644 --- a/version +++ b/version @@ -1 +1 @@ -KVER=7.0 +KVER=7.1-rc1