From 321d5ec9f7e862872496f857a5885e56190d3616 Mon Sep 17 00:00:00 2001 From: mexisme Date: Tue, 10 Jan 2023 12:16:03 +1300 Subject: [PATCH 01/11] Add kernel 6.1.3 --- microsoft/surface/kernel/default.nix | 1 + .../surface/kernel/linux-6.1.3/default.nix | 38 ++++++ .../surface/kernel/linux-6.1.3/patches.nix | 122 ++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 microsoft/surface/kernel/linux-6.1.3/default.nix create mode 100644 microsoft/surface/kernel/linux-6.1.3/patches.nix diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix index 6eba2ca..f44bf60 100644 --- a/microsoft/surface/kernel/default.nix +++ b/microsoft/surface/kernel/default.nix @@ -7,6 +7,7 @@ in { imports = [ ./linux-5.19.17 ./linux-6.0.11 + ./linux-6.1.3 ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/kernel/linux-6.1.3/default.nix b/microsoft/surface/kernel/linux-6.1.3/default.nix new file mode 100644 index 0000000..bd9c0ec --- /dev/null +++ b/microsoft/surface/kernel/linux-6.1.3/default.nix @@ -0,0 +1,38 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkOption types; + inherit (pkgs) fetchurl; + + inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage repos; + + cfg = config.microsoft-surface; + + version = "6.1.3"; + extraMeta.branch = "6.1"; + patchDir = repos.linux-surface + "/patches/${extraMeta.branch}"; + kernelPatches = pkgs.callPackage ./patches.nix { + inherit (lib) kernel; + inherit version patchDir; + }; + + kernelPackages = linuxPackage { + inherit version extraMeta kernelPatches; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + sha256 = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc="; + }; + }; + + +in { + options.microsoft-surface.kernelVersion = mkOption { + type = types.enum [ "6.1.3" ]; + }; + + config = mkIf (cfg.kernelVersion == "6.1.3") { + boot = { + inherit kernelPackages; + }; + }; +} diff --git a/microsoft/surface/kernel/linux-6.1.3/patches.nix b/microsoft/surface/kernel/linux-6.1.3/patches.nix new file mode 100644 index 0000000..7b0d096 --- /dev/null +++ b/microsoft/surface/kernel/linux-6.1.3/patches.nix @@ -0,0 +1,122 @@ +{ kernel, + patchDir, + version, +}: + +[ + { + name = "microsoft-surface-patches-linux-${version}"; + patch = null; + structuredExtraConfig = with kernel; { + # + # Surface Aggregator Module + # + CONFIG_SURFACE_AGGREGATOR = module; + CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION = no; + CONFIG_SURFACE_AGGREGATOR_BUS = yes; + CONFIG_SURFACE_AGGREGATOR_CDEV = module; + CONFIG_SURFACE_AGGREGATOR_HUB = module; + CONFIG_SURFACE_AGGREGATOR_REGISTRY = module; + CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH = module; + + CONFIG_SURFACE_ACPI_NOTIFY = module; + CONFIG_SURFACE_DTX = module; + CONFIG_SURFACE_PLATFORM_PROFILE = module; + + CONFIG_SURFACE_HID = module; + CONFIG_SURFACE_KBD = module; + + CONFIG_BATTERY_SURFACE = module; + CONFIG_CHARGER_SURFACE = module; + + # + # Surface Hotplug + # + CONFIG_SURFACE_HOTPLUG = module; + + # + # IPTS touchscreen + # + # This only enables the user interface for IPTS data. + # For the touchscreen to work, you need to install iptsd. + # + CONFIG_MISC_IPTS = module; + + # + # Cameras: IPU3 + # + CONFIG_VIDEO_DW9719 = module; + CONFIG_VIDEO_IPU3_IMGU = module; + CONFIG_VIDEO_IPU3_CIO2 = module; + CONFIG_CIO2_BRIDGE = yes; + CONFIG_INTEL_SKL_INT3472 = module; + CONFIG_REGULATOR_TPS68470 = module; + CONFIG_COMMON_CLK_TPS68470 = module; + + # + # Cameras: Sensor drivers + # + CONFIG_VIDEO_OV5693 = module; + CONFIG_VIDEO_OV7251 = module; + CONFIG_VIDEO_OV8865 = module; + + # + # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7 + # + CONFIG_APDS9960 = module; + + # + # Other Drivers + # + CONFIG_INPUT_SOC_BUTTON_ARRAY = module; + CONFIG_SURFACE_3_POWER_OPREGION = module; + CONFIG_SURFACE_PRO3_BUTTON = module; + CONFIG_SURFACE_GPE = module; + CONFIG_SURFACE_BOOK1_DGPU_SWITCH = module; + }; + } + { + name = "ms-surface/0001-surface3-oemb"; + patch = patchDir + "/0001-surface3-oemb.patch"; + } + { + name = "ms-surface/0002-mwifiex"; + patch = patchDir + "/0002-mwifiex.patch"; + } + { + name = "ms-surface/0003-ath10k"; + patch = patchDir + "/0003-ath10k.patch"; + } + { + name = "ms-surface/0004-ipts"; + patch = patchDir + "/0004-ipts.patch"; + } + { + name = "ms-surface/0005-surface-sam"; + patch = patchDir + "/0005-surface-sam.patch"; + } + { + name = "ms-surface/0006-surface-sam-over-hid"; + patch = patchDir + "/0006-surface-sam-over-hid.patch"; + } + { + name = "ms-surface/0007-surface-button"; + patch = patchDir + "/0007-surface-button.patch"; + } + { + name = "ms-surface/0008-surface-typecover"; + patch = patchDir + "/0008-surface-typecover.patch"; + } + { + name = "ms-surface/0009-cameras"; + patch = patchDir + "/0009-cameras.patch"; + } + { + name = "ms-surface/0010-amd-gpio"; + patch = patchDir + "/0010-amd-gpio.patch"; + } + { + name = "ms-surface/0011-rtc"; + patch = patchDir + "/0011-rtc.patch"; + } +] From 05bbf0f04069eaf515b319606664adc49c1fa55f Mon Sep 17 00:00:00 2001 From: mexisme Date: Mon, 9 Jan 2023 23:44:36 +1300 Subject: [PATCH 02/11] Update the rev. and sha256 of linux-surface repo to match latest "master" --- microsoft/surface/repos.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microsoft/surface/repos.nix b/microsoft/surface/repos.nix index b15dd7e..eb9e5fa 100644 --- a/microsoft/surface/repos.nix +++ b/microsoft/surface/repos.nix @@ -4,8 +4,8 @@ linux-surface = fetchFromGitHub { owner = "linux-surface"; repo = "linux-surface"; - rev = "8995c6b3b4fb659397f4ebc760c6ac8b5efc5488"; - sha256 = "sha256-r7nbW0WKmvw7mMZL1BzuFwgwftyN5FIfP5xLDiQMEiI="; + rev = "487e64047ca047dde9a062909a87410e7bb86845"; + sha256 = "sha256-HTIuRBZk0prhUPd2KnsXGo+ZyBsMwERN7P8WJH1RG3M="; }; # This is the owner and repo for the pre-patched kernel from the "linux-surface" project: From 5c836a9a365eee0b4d730db70f78bda2fa286e20 Mon Sep 17 00:00:00 2001 From: mexisme Date: Thu, 19 Jan 2023 03:06:56 +1300 Subject: [PATCH 03/11] Typo: "CONFIG_" prefix in structuredExtraConfig patches - Unintentional typo, due to copy-paste from linux-surface upstream config --- .../common/kernel/linux-6.0.17/patches.nix | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/microsoft/surface/common/kernel/linux-6.0.17/patches.nix b/microsoft/surface/common/kernel/linux-6.0.17/patches.nix index 7b0d096..f0ba2c9 100644 --- a/microsoft/surface/common/kernel/linux-6.0.17/patches.nix +++ b/microsoft/surface/common/kernel/linux-6.0.17/patches.nix @@ -11,28 +11,28 @@ # # Surface Aggregator Module # - CONFIG_SURFACE_AGGREGATOR = module; - CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION = no; - CONFIG_SURFACE_AGGREGATOR_BUS = yes; - CONFIG_SURFACE_AGGREGATOR_CDEV = module; - CONFIG_SURFACE_AGGREGATOR_HUB = module; - CONFIG_SURFACE_AGGREGATOR_REGISTRY = module; - CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH = module; + SURFACE_AGGREGATOR = module; + SURFACE_AGGREGATOR_ERROR_INJECTION = no; + SURFACE_AGGREGATOR_BUS = yes; + SURFACE_AGGREGATOR_CDEV = module; + SURFACE_AGGREGATOR_HUB = module; + SURFACE_AGGREGATOR_REGISTRY = module; + SURFACE_AGGREGATOR_TABLET_SWITCH = module; - CONFIG_SURFACE_ACPI_NOTIFY = module; - CONFIG_SURFACE_DTX = module; - CONFIG_SURFACE_PLATFORM_PROFILE = module; + SURFACE_ACPI_NOTIFY = module; + SURFACE_DTX = module; + SURFACE_PLATFORM_PROFILE = module; - CONFIG_SURFACE_HID = module; - CONFIG_SURFACE_KBD = module; + SURFACE_HID = module; + SURFACE_KBD = module; - CONFIG_BATTERY_SURFACE = module; - CONFIG_CHARGER_SURFACE = module; + BATTERY_SURFACE = module; + CHARGER_SURFACE = module; # # Surface Hotplug # - CONFIG_SURFACE_HOTPLUG = module; + SURFACE_HOTPLUG = module; # # IPTS touchscreen @@ -40,39 +40,39 @@ # This only enables the user interface for IPTS data. # For the touchscreen to work, you need to install iptsd. # - CONFIG_MISC_IPTS = module; + MISC_IPTS = module; # # Cameras: IPU3 # - CONFIG_VIDEO_DW9719 = module; - CONFIG_VIDEO_IPU3_IMGU = module; - CONFIG_VIDEO_IPU3_CIO2 = module; - CONFIG_CIO2_BRIDGE = yes; - CONFIG_INTEL_SKL_INT3472 = module; - CONFIG_REGULATOR_TPS68470 = module; - CONFIG_COMMON_CLK_TPS68470 = module; + VIDEO_DW9719 = module; + VIDEO_IPU3_IMGU = module; + VIDEO_IPU3_CIO2 = module; + CIO2_BRIDGE = yes; + INTEL_SKL_INT3472 = module; + REGULATOR_TPS68470 = module; + COMMON_CLK_TPS68470 = module; # # Cameras: Sensor drivers # - CONFIG_VIDEO_OV5693 = module; - CONFIG_VIDEO_OV7251 = module; - CONFIG_VIDEO_OV8865 = module; + VIDEO_OV5693 = module; + VIDEO_OV7251 = module; + VIDEO_OV8865 = module; # # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7 # - CONFIG_APDS9960 = module; + APDS9960 = module; # # Other Drivers # - CONFIG_INPUT_SOC_BUTTON_ARRAY = module; - CONFIG_SURFACE_3_POWER_OPREGION = module; - CONFIG_SURFACE_PRO3_BUTTON = module; - CONFIG_SURFACE_GPE = module; - CONFIG_SURFACE_BOOK1_DGPU_SWITCH = module; + INPUT_SOC_BUTTON_ARRAY = module; + SURFACE_3_POWER_OPREGION = module; + SURFACE_PRO3_BUTTON = module; + SURFACE_GPE = module; + SURFACE_BOOK1_DGPU_SWITCH = module; }; } { From 2933836fa59d45d897f53a92deb712c77d43325a Mon Sep 17 00:00:00 2001 From: mexisme Date: Thu, 19 Jan 2023 03:11:39 +1300 Subject: [PATCH 04/11] Typo: "CONFIG_" prefix in structuredExtraConfig patches - Unintentional typo, due to copy-paste from linux-surface upstream config --- .../common/kernel/linux-6.1.3/patches.nix | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/microsoft/surface/common/kernel/linux-6.1.3/patches.nix b/microsoft/surface/common/kernel/linux-6.1.3/patches.nix index 7b0d096..f0ba2c9 100644 --- a/microsoft/surface/common/kernel/linux-6.1.3/patches.nix +++ b/microsoft/surface/common/kernel/linux-6.1.3/patches.nix @@ -11,28 +11,28 @@ # # Surface Aggregator Module # - CONFIG_SURFACE_AGGREGATOR = module; - CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION = no; - CONFIG_SURFACE_AGGREGATOR_BUS = yes; - CONFIG_SURFACE_AGGREGATOR_CDEV = module; - CONFIG_SURFACE_AGGREGATOR_HUB = module; - CONFIG_SURFACE_AGGREGATOR_REGISTRY = module; - CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH = module; + SURFACE_AGGREGATOR = module; + SURFACE_AGGREGATOR_ERROR_INJECTION = no; + SURFACE_AGGREGATOR_BUS = yes; + SURFACE_AGGREGATOR_CDEV = module; + SURFACE_AGGREGATOR_HUB = module; + SURFACE_AGGREGATOR_REGISTRY = module; + SURFACE_AGGREGATOR_TABLET_SWITCH = module; - CONFIG_SURFACE_ACPI_NOTIFY = module; - CONFIG_SURFACE_DTX = module; - CONFIG_SURFACE_PLATFORM_PROFILE = module; + SURFACE_ACPI_NOTIFY = module; + SURFACE_DTX = module; + SURFACE_PLATFORM_PROFILE = module; - CONFIG_SURFACE_HID = module; - CONFIG_SURFACE_KBD = module; + SURFACE_HID = module; + SURFACE_KBD = module; - CONFIG_BATTERY_SURFACE = module; - CONFIG_CHARGER_SURFACE = module; + BATTERY_SURFACE = module; + CHARGER_SURFACE = module; # # Surface Hotplug # - CONFIG_SURFACE_HOTPLUG = module; + SURFACE_HOTPLUG = module; # # IPTS touchscreen @@ -40,39 +40,39 @@ # This only enables the user interface for IPTS data. # For the touchscreen to work, you need to install iptsd. # - CONFIG_MISC_IPTS = module; + MISC_IPTS = module; # # Cameras: IPU3 # - CONFIG_VIDEO_DW9719 = module; - CONFIG_VIDEO_IPU3_IMGU = module; - CONFIG_VIDEO_IPU3_CIO2 = module; - CONFIG_CIO2_BRIDGE = yes; - CONFIG_INTEL_SKL_INT3472 = module; - CONFIG_REGULATOR_TPS68470 = module; - CONFIG_COMMON_CLK_TPS68470 = module; + VIDEO_DW9719 = module; + VIDEO_IPU3_IMGU = module; + VIDEO_IPU3_CIO2 = module; + CIO2_BRIDGE = yes; + INTEL_SKL_INT3472 = module; + REGULATOR_TPS68470 = module; + COMMON_CLK_TPS68470 = module; # # Cameras: Sensor drivers # - CONFIG_VIDEO_OV5693 = module; - CONFIG_VIDEO_OV7251 = module; - CONFIG_VIDEO_OV8865 = module; + VIDEO_OV5693 = module; + VIDEO_OV7251 = module; + VIDEO_OV8865 = module; # # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7 # - CONFIG_APDS9960 = module; + APDS9960 = module; # # Other Drivers # - CONFIG_INPUT_SOC_BUTTON_ARRAY = module; - CONFIG_SURFACE_3_POWER_OPREGION = module; - CONFIG_SURFACE_PRO3_BUTTON = module; - CONFIG_SURFACE_GPE = module; - CONFIG_SURFACE_BOOK1_DGPU_SWITCH = module; + INPUT_SOC_BUTTON_ARRAY = module; + SURFACE_3_POWER_OPREGION = module; + SURFACE_PRO3_BUTTON = module; + SURFACE_GPE = module; + SURFACE_BOOK1_DGPU_SWITCH = module; }; } { From ab4c0eedb668a142403b4ea94ce64f401a1a0ab9 Mon Sep 17 00:00:00 2001 From: mexisme Date: Thu, 19 Jan 2023 13:20:36 +1300 Subject: [PATCH 05/11] Begin updating to kernel 6.1.6 --- microsoft/surface/common/kernel/default.nix | 2 +- .../common/kernel/{linux-6.1.3 => linux-6.1.6}/default.nix | 0 .../common/kernel/{linux-6.1.3 => linux-6.1.6}/patches.nix | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename microsoft/surface/common/kernel/{linux-6.1.3 => linux-6.1.6}/default.nix (100%) rename microsoft/surface/common/kernel/{linux-6.1.3 => linux-6.1.6}/patches.nix (100%) diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix index dbaa678..f8044d3 100644 --- a/microsoft/surface/common/kernel/default.nix +++ b/microsoft/surface/common/kernel/default.nix @@ -7,7 +7,7 @@ in { imports = [ ./linux-5.19.17 ./linux-6.0.17 - ./linux-6.1.3 + ./linux-6.1.6 ]; options.microsoft-surface.kernelVersion = mkOption { diff --git a/microsoft/surface/common/kernel/linux-6.1.3/default.nix b/microsoft/surface/common/kernel/linux-6.1.6/default.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.1.3/default.nix rename to microsoft/surface/common/kernel/linux-6.1.6/default.nix diff --git a/microsoft/surface/common/kernel/linux-6.1.3/patches.nix b/microsoft/surface/common/kernel/linux-6.1.6/patches.nix similarity index 100% rename from microsoft/surface/common/kernel/linux-6.1.3/patches.nix rename to microsoft/surface/common/kernel/linux-6.1.6/patches.nix From 863953246fd2e8c21ed8799a26564cfc2ca4a7b7 Mon Sep 17 00:00:00 2001 From: mexisme Date: Thu, 19 Jan 2023 13:26:43 +1300 Subject: [PATCH 06/11] Update to kernel 6.1.6 --- microsoft/surface/common/kernel/linux-6.1.6/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/microsoft/surface/common/kernel/linux-6.1.6/default.nix b/microsoft/surface/common/kernel/linux-6.1.6/default.nix index bd9c0ec..86c17a9 100644 --- a/microsoft/surface/common/kernel/linux-6.1.6/default.nix +++ b/microsoft/surface/common/kernel/linux-6.1.6/default.nix @@ -8,7 +8,7 @@ let cfg = config.microsoft-surface; - version = "6.1.3"; + version = "6.1.6"; extraMeta.branch = "6.1"; patchDir = repos.linux-surface + "/patches/${extraMeta.branch}"; kernelPatches = pkgs.callPackage ./patches.nix { @@ -20,17 +20,17 @@ let inherit version extraMeta kernelPatches; src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc="; + sha256 = "sha256-Pk2OVh2lcDogWujXsr7WxcZPxCme68v9IEgeY7V9XuM="; }; }; in { options.microsoft-surface.kernelVersion = mkOption { - type = types.enum [ "6.1.3" ]; + type = types.enum [ "6.1.6" ]; }; - config = mkIf (cfg.kernelVersion == "6.1.3") { + config = mkIf (cfg.kernelVersion == "6.1.6") { boot = { inherit kernelPackages; }; From 2316f4cb8cacf78ec0faf827c0f7a5929ff1b316 Mon Sep 17 00:00:00 2001 From: mexisme Date: Thu, 19 Jan 2023 13:54:46 +1300 Subject: [PATCH 07/11] Configure MS Surface Go to use kernel 6.1.6 --- microsoft/surface/surface-go/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/microsoft/surface/surface-go/default.nix b/microsoft/surface/surface-go/default.nix index fdd13f6..b57d73e 100644 --- a/microsoft/surface/surface-go/default.nix +++ b/microsoft/surface/surface-go/default.nix @@ -17,6 +17,8 @@ in { ../../../common/cpu/intel/kaby-lake ]; + microsoft-surface.kernelVersion = "6.1.6"; + boot.kernelParams = [ "i915.enable_rc6=1" "i915.modeset=1" From 27b616b63ac917583879969d909b673918cc8979 Mon Sep 17 00:00:00 2001 From: mexisme Date: Thu, 19 Jan 2023 14:36:57 +1300 Subject: [PATCH 08/11] Update repo rev and SHA-256 for linux-surface --- microsoft/surface/common/repos.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microsoft/surface/common/repos.nix b/microsoft/surface/common/repos.nix index eb9e5fa..f10ad9a 100644 --- a/microsoft/surface/common/repos.nix +++ b/microsoft/surface/common/repos.nix @@ -4,8 +4,8 @@ linux-surface = fetchFromGitHub { owner = "linux-surface"; repo = "linux-surface"; - rev = "487e64047ca047dde9a062909a87410e7bb86845"; - sha256 = "sha256-HTIuRBZk0prhUPd2KnsXGo+ZyBsMwERN7P8WJH1RG3M="; + rev = "91240ac43dfdfb3e68bbc604def84685a218fab9"; + sha256 = "sha256-Jf7tthFWj67Esjx+/ZwG7BYlN7zWS26e1TbsznNxE9Q="; }; # This is the owner and repo for the pre-patched kernel from the "linux-surface" project: From 906737f5801d9809e60259f3e54d85728c7fc642 Mon Sep 17 00:00:00 2001 From: mexisme Date: Thu, 19 Jan 2023 17:00:17 +1300 Subject: [PATCH 09/11] Enable STREAMING_MEDIA kernel option --- microsoft/surface/common/kernel/linux-6.1.6/patches.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/microsoft/surface/common/kernel/linux-6.1.6/patches.nix b/microsoft/surface/common/kernel/linux-6.1.6/patches.nix index f0ba2c9..7b3cfdc 100644 --- a/microsoft/surface/common/kernel/linux-6.1.6/patches.nix +++ b/microsoft/surface/common/kernel/linux-6.1.6/patches.nix @@ -8,6 +8,8 @@ name = "microsoft-surface-patches-linux-${version}"; patch = null; structuredExtraConfig = with kernel; { + STREAMING_MEDIA = yes; + # # Surface Aggregator Module # From 759a06ec4a4dbcb1f33ebab074477a6e49a9dba7 Mon Sep 17 00:00:00 2001 From: surfaceflinger Date: Fri, 20 Jan 2023 21:35:06 +0100 Subject: [PATCH 10/11] lenovo/thinkpad/t440p: force load thinkpad_acpi thinkpad_acpi doesn't load automatically on corebooted Lenovo ThinkPads T440p (but works fine if force_loaded). Doesn't affect users with stock firmware. --- lenovo/thinkpad/t440p/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix index 53a93c2..8d93291 100644 --- a/lenovo/thinkpad/t440p/default.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -9,6 +9,7 @@ boot = { extraModprobeConfig = lib.mkDefault '' options bbswitch use_acpi_to_detect_card_state=1 + options thinkpad_acpi force_load=1 fan_control=1 ''; # TODO: probably enable tcsd? Is this line necessary? kernelModules = [ "tpm-rng" ]; From d25ac8d999db568b7eb9f831434ac7797df421db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Jan 2023 08:54:28 +0000 Subject: [PATCH 11/11] Update lenovo/thinkpad/t440p/default.nix --- lenovo/thinkpad/t440p/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix index 8d93291..144b7d0 100644 --- a/lenovo/thinkpad/t440p/default.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -7,7 +7,7 @@ ]; boot = { - extraModprobeConfig = lib.mkDefault '' + extraModprobeConfig = '' options bbswitch use_acpi_to_detect_card_state=1 options thinkpad_acpi force_load=1 fan_control=1 '';