Browse Source

Update v6.1 patches

Changes:
 - Clean up commits for the Surface Pro 9 tablet-mode switch.
 - Rebase onto v6.1.15

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/2b0e63157548220ded5a242efc436163ae38f509
Maximilian Luz 2 năm trước cách đây
mục cha
commit
6fb88c783a

+ 1 - 1
patches/6.1/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 5a10b485f10e3dbba1c94e15e63e7ba95949ce8f Mon Sep 17 00:00:00 2001
+From e0cc46bdc5785ddff92898e4a1afebe068211816 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 18 Oct 2020 16:42:44 +0900
 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI

+ 3 - 3
patches/6.1/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From 6ce4113ed6011be04f3ab18a7c84b0a35df6875c Mon Sep 17 00:00:00 2001
+From 18ba79f7e8f0c7868546a055e1a5e92d592fb1cd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 3 Nov 2020 13:28:04 +0100
 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
@@ -165,7 +165,7 @@ index d6ff964aec5b..5d30ae39d65e 100644
 -- 
 2.39.2
 
-From cd6d152769abdefae6e61ec4d495f3ed9b0059aa Mon Sep 17 00:00:00 2001
+From 827f3bdbdefa9669b6e045123de8680aa5b7f68f Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:11:49 +0900
 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@@ -320,7 +320,7 @@ index 5d30ae39d65e..c14eb56eb911 100644
 -- 
 2.39.2
 
-From 6514a9dde3e8122dc2bf6e1a3f779fceaef4f0e8 Mon Sep 17 00:00:00 2001
+From 138bdea69311333478b99ed1774ffb44dcefa50d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 25 Mar 2021 11:33:02 +0100
 Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell

+ 1 - 1
patches/6.1/0003-ath10k.patch

@@ -1,4 +1,4 @@
-From 342ad27471e4f0467a5416b5000d778119d3c0a3 Mon Sep 17 00:00:00 2001
+From a26f4c17fd48c0fdeb62adec4fe12d5a4473760d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 27 Feb 2021 00:45:52 +0100
 Subject: [PATCH] ath10k: Add module parameters to override board files

+ 3 - 3
patches/6.1/0004-ipts.patch

@@ -1,4 +1,4 @@
-From 120ef1b918cfa26c70e254d5760e7f1071515e94 Mon Sep 17 00:00:00 2001
+From 4741330a1183e82484a76bc16b02c4053e8ec36e Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 30 Jul 2020 13:21:53 +0200
 Subject: [PATCH] misc: mei: Add missing IPTS device IDs
@@ -36,7 +36,7 @@ index 5bf0d50d55a0..c13864512229 100644
 -- 
 2.39.2
 
-From 6c59a3902112567f01620b727f94e2a910cd351f Mon Sep 17 00:00:00 2001
+From 618726368765112066431f3bfdddfa16f6a55e75 Mon Sep 17 00:00:00 2001
 From: Liban Hannan <liban.p@gmail.com>
 Date: Tue, 12 Apr 2022 23:31:12 +0100
 Subject: [PATCH] iommu: ipts: use IOMMU passthrough mode for IPTS
@@ -136,7 +136,7 @@ index 644ca49e8cf8..408c321b929a 100644
 -- 
 2.39.2
 
-From 2bf7dacaff311d5e472bb3bf39113f5fee5f8e24 Mon Sep 17 00:00:00 2001
+From 56532fb66514b45118edc18f1a1cf01193e7903c Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 11 Dec 2022 12:00:59 +0100
 Subject: [PATCH] hid: Add support for Intel Precise Touch and Stylus

+ 2 - 2
patches/6.1/0005-ithc.patch

@@ -1,4 +1,4 @@
-From 9d023b64e41b5bb7a993e5c32964d5bb11dc76ea Mon Sep 17 00:00:00 2001
+From 76d4f47d20b456fe3161235a32eb66ab6343774f Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 11 Dec 2022 12:03:38 +0100
 Subject: [PATCH] iommu: intel: Disable source id verification for ITHC
@@ -39,7 +39,7 @@ index 5962bb5027d0..86fa129d10d4 100644
 -- 
 2.39.2
 
-From ae7151828db3806379e313770db54dee598f0e59 Mon Sep 17 00:00:00 2001
+From 323b9b4abffc5dfee38a378b002c38de526e175d Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 11 Dec 2022 12:10:54 +0100
 Subject: [PATCH] hid: Add support for Intel Touch Host Controller

+ 153 - 89
patches/6.1/0006-surface-sam.patch

@@ -1,4 +1,4 @@
-From 0e3664a9ba1b3ead91be2efaac925b2bdf690151 Mon Sep 17 00:00:00 2001
+From 4aaf29ca81d5b2cbaf966e76767aaa7c90002131 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:20 +0100
 Subject: [PATCH] platform/surface: aggregator: Improve documentation and
@@ -289,7 +289,7 @@ index 45501b6e54e8..5c4ae1a26183 100644
 -- 
 2.39.2
 
-From 34940c93f45df98a51fa9cfa9cf0591df754819c Mon Sep 17 00:00:00 2001
+From 8e9274be18670244df934c69f4646f76faf3dd06 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:21 +0100
 Subject: [PATCH] platform/surface: aggregator: Add target and source IDs to
@@ -486,7 +486,7 @@ index 2a2c17771d01..55cc61bba1da 100644
 -- 
 2.39.2
 
-From ca0942524cdfd7db9f9be3bcf2672e76093913a5 Mon Sep 17 00:00:00 2001
+From 2d50e334a0151f48679e46e69529d700e1c84d54 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:22 +0100
 Subject: [PATCH] platform/surface: aggregator_hub: Use target-ID enum instead
@@ -529,7 +529,7 @@ index 43061514be38..62f27cdb6ca8 100644
 -- 
 2.39.2
 
-From a99128fe82accf55bd1d200fbc3f3feb2fd55801 Mon Sep 17 00:00:00 2001
+From 6f68a237018106f28ce806331ff857122c21a91d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:23 +0100
 Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum
@@ -581,7 +581,7 @@ index 27d95a6a7851..bd8cd453c393 100644
 -- 
 2.39.2
 
-From 7555620eb1f6c89d1568274d5808e093cdc209ea Mon Sep 17 00:00:00 2001
+From 91db465f192db19eb6804f572b09f30af8025f8d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:24 +0100
 Subject: [PATCH] platform/surface: dtx: Use target-ID enum instead of
@@ -679,7 +679,7 @@ index ed36944467f9..0de76a784a35 100644
 -- 
 2.39.2
 
-From 82ef8b7ea80d3f3206241d89ca92b72eaf0e23fe Mon Sep 17 00:00:00 2001
+From 2a7c52d2a29084b0dc53e4ad6d36781ea1387a8e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:26 +0100
 Subject: [PATCH] platform/surface: aggregator: Enforce use of target-ID enum
@@ -915,7 +915,7 @@ index 46c45d1b6368..4da20b7a0ee5 100644
 -- 
 2.39.2
 
-From 9909e49d5c81636829920a86f175c1c5bae3a493 Mon Sep 17 00:00:00 2001
+From f48e449a88463a42ae0fd8604e82ad8705e1fac7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Dec 2022 23:33:27 +0100
 Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of
@@ -970,7 +970,7 @@ index 023f126121d7..296f72d52e6a 100644
 -- 
 2.39.2
 
-From 9854fe03066a6a5d1d9672b4ef85162673ce60dc Mon Sep 17 00:00:00 2001
+From 8b1f4bf5e08f3bf82d9a85e37052f9a7b508f7f2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 20 Dec 2022 18:56:08 +0100
 Subject: [PATCH] platform/surface: aggregator: Rename top-level request
@@ -1517,7 +1517,7 @@ index 4da20b7a0ee5..1545e5567b15 100644
 -- 
 2.39.2
 
-From d56137459f3c4e14665720620b12a99494bd2fc9 Mon Sep 17 00:00:00 2001
+From 34a117b799937a69868bdd716f7c44e6e2a6f17b Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Wed, 18 Jan 2023 11:38:23 +0200
 Subject: [PATCH] platform/surface: Switch to use acpi_evaluate_dsm_typed()
@@ -1573,30 +1573,34 @@ index f004a2495201..7b6d887dccdb 100644
 -- 
 2.39.2
 
-From 0ec60b307909eb59a9c3e759364942547084dc23 Mon Sep 17 00:00:00 2001
+From 61ce59f6decd7b649bb6f18c6f1badfbc6b4c59a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
-Date: Sun, 19 Feb 2023 23:33:43 +0100
-Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for
- Type-Cover posture source
+Date: Sat, 4 Mar 2023 20:09:36 +0100
+Subject: [PATCH] platform/surface: aggregator_tabletsw: Properly handle
+ different posture source IDs
 
-The POS-subsystem can provide different sources for querying device
-posture states and receiving posture-change events. We use this
-subsystem to implement tablet-mode events on newer Surface devices.
+The device posture subsystem (POS) can provide different posture
+sources. Different sources can provide different posture states and
+sources can be identified by their ID.
 
-Currently, however, the driver only implements support for the Surface
-Laptop Studio, with source ID 0. This has been hard-coded. Therefore,
-make the driver more flexible to support more source types and also
-implement support for the Type-Cover source type found on the Surface
-Pro 9.
+For example, screen posture of the Surface Laptop Studio (SLS), which is
+currently the only supported source, uses a source ID of 0x03. The
+Surface Pro 9 uses the same subsystem for its Type-Cover, however,
+provides different states for that under the ID 0x00.
+
+To eventually support the Surface Pro 9 and potential future devices, we
+need to properly disambiguate between source IDs. Therefore, add the
+source ID to the state we carry and determine the tablet-mode state (as
+well as state names) based on that.
 
 Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
 Patchset: surface-sam
 ---
- .../surface/surface_aggregator_tabletsw.c     | 180 ++++++++++++++----
- 1 file changed, 141 insertions(+), 39 deletions(-)
+ .../surface/surface_aggregator_tabletsw.c     | 123 ++++++++++++------
+ 1 file changed, 84 insertions(+), 39 deletions(-)
 
 diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
-index 9fed800c7cc0..8f52b62d1c19 100644
+index 9fed800c7cc0..e8682f52558f 100644
 --- a/drivers/platform/surface/surface_aggregator_tabletsw.c
 +++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
 @@ -20,16 +20,23 @@
@@ -1743,7 +1747,7 @@ index 9fed800c7cc0..8f52b62d1c19 100644
  	return 0;
  }
  
-@@ -312,11 +324,24 @@ MODULE_PARM_DESC(tablet_mode_in_slate_state, "Enable tablet mode in slate device
+@@ -312,11 +324,15 @@ MODULE_PARM_DESC(tablet_mode_in_slate_state, "Enable tablet mode in slate device
  #define SSAM_EVENT_POS_CID_POSTURE_CHANGED	0x03
  #define SSAM_POS_MAX_SOURCES			4
  
@@ -1753,18 +1757,9 @@ index 9fed800c7cc0..8f52b62d1c19 100644
 -	SSAM_POS_POSTURE_SLATE      = 0x02,
 -	SSAM_POS_POSTURE_TABLET     = 0x03,
 +enum ssam_pos_source_id {
-+	SSAM_POS_SOURCE_COVER = 0x00,
 +	SSAM_POS_SOURCE_SLS   = 0x03,
 +};
 +
-+enum ssam_pos_state_cover {
-+	SSAM_POS_COVER_DISCONNECTED  = 0x01,
-+	SSAM_POS_COVER_CLOSED        = 0x02,
-+	SSAM_POS_COVER_LAPTOP        = 0x03,
-+	SSAM_POS_COVER_FOLDED_CANVAS = 0x04,
-+	SSAM_POS_COVER_FOLDED_BACK   = 0x05,
-+};
-+
 +enum ssam_pos_state_sls {
 +	SSAM_POS_SLS_LID_CLOSED = 0x00,
 +	SSAM_POS_SLS_LAPTOP     = 0x01,
@@ -1773,35 +1768,11 @@ index 9fed800c7cc0..8f52b62d1c19 100644
  };
  
  struct ssam_sources_list {
-@@ -324,42 +349,116 @@ struct ssam_sources_list {
+@@ -324,42 +340,68 @@ struct ssam_sources_list {
  	__le32 id[SSAM_POS_MAX_SOURCES];
  } __packed;
  
 -static const char *ssam_pos_state_name(struct ssam_tablet_sw *sw, u32 state)
-+static const char *ssam_pos_state_name_cover(struct ssam_tablet_sw *sw, u32 state)
-+{
-+	switch (state) {
-+	case SSAM_POS_COVER_DISCONNECTED:
-+		return "disconnected";
-+
-+	case SSAM_POS_COVER_CLOSED:
-+		return "closed";
-+
-+	case SSAM_POS_COVER_LAPTOP:
-+		return "laptop";
-+
-+	case SSAM_POS_COVER_FOLDED_CANVAS:
-+		return "folded-canvas";
-+
-+	case SSAM_POS_COVER_FOLDED_BACK:
-+		return "folded-back";
-+
-+	default:
-+		dev_warn(&sw->sdev->dev, "unknown device posture for type-cover: %u\n", state);
-+		return "<unknown>";
-+	}
-+}
-+
 +static const char *ssam_pos_state_name_sls(struct ssam_tablet_sw *sw, u32 state)
  {
  	switch (state) {
@@ -1833,9 +1804,6 @@ index 9fed800c7cc0..8f52b62d1c19 100644
 +				       const struct ssam_tablet_sw_state *state)
 +{
 +	switch (state->source) {
-+	case SSAM_POS_SOURCE_COVER:
-+		return ssam_pos_state_name_cover(sw, state->state);
-+
 +	case SSAM_POS_SOURCE_SLS:
 +		return ssam_pos_state_name_sls(sw, state->state);
 +
@@ -1845,34 +1813,16 @@ index 9fed800c7cc0..8f52b62d1c19 100644
 +	}
 +}
 +
-+static bool ssam_pos_state_is_tablet_mode_cover(struct ssam_tablet_sw *sw, u32 state)
++static bool ssam_pos_state_is_tablet_mode_sls(struct ssam_tablet_sw *sw, u32 state)
  {
  	switch (state) {
 -	case SSAM_POS_POSTURE_LAPTOP:
 -	case SSAM_POS_POSTURE_LID_CLOSED:
-+	case SSAM_POS_COVER_DISCONNECTED:
-+	case SSAM_POS_COVER_FOLDED_CANVAS:
-+	case SSAM_POS_COVER_FOLDED_BACK:
-+		return true;
-+
-+	case SSAM_POS_COVER_CLOSED:
-+	case SSAM_POS_COVER_LAPTOP:
++	case SSAM_POS_SLS_LAPTOP:
++	case SSAM_POS_SLS_LID_CLOSED:
  		return false;
  
 -	case SSAM_POS_POSTURE_SLATE:
-+	default:
-+		dev_warn(&sw->sdev->dev, "unknown device posture for type-cover: %u\n", state);
-+		return true;
-+	}
-+}
-+
-+static bool ssam_pos_state_is_tablet_mode_sls(struct ssam_tablet_sw *sw, u32 state)
-+{
-+	switch (state) {
-+	case SSAM_POS_SLS_LAPTOP:
-+	case SSAM_POS_SLS_LID_CLOSED:
-+		return false;
-+
 +	case SSAM_POS_SLS_SLATE:
  		return tablet_mode_in_slate_state;
  
@@ -1891,9 +1841,6 @@ index 9fed800c7cc0..8f52b62d1c19 100644
 +					  const struct ssam_tablet_sw_state *state)
 +{
 +	switch (state->source) {
-+	case SSAM_POS_SOURCE_COVER:
-+		return ssam_pos_state_is_tablet_mode_cover(sw, state->state);
-+
 +	case SSAM_POS_SOURCE_SLS:
 +		return ssam_pos_state_is_tablet_mode_sls(sw, state->state);
 +
@@ -1902,7 +1849,7 @@ index 9fed800c7cc0..8f52b62d1c19 100644
  		return true;
  	}
  }
-@@ -450,9 +549,10 @@ static int ssam_pos_get_posture_for_source(struct ssam_tablet_sw *sw, u32 source
+@@ -450,9 +492,10 @@ static int ssam_pos_get_posture_for_source(struct ssam_tablet_sw *sw, u32 source
  	return 0;
  }
  
@@ -1914,7 +1861,7 @@ index 9fed800c7cc0..8f52b62d1c19 100644
  	int status;
  
  	status = ssam_pos_get_source(sw, &source_id);
-@@ -461,13 +561,15 @@ static int ssam_pos_get_posture(struct ssam_tablet_sw *sw, u32 *state)
+@@ -461,13 +504,15 @@ static int ssam_pos_get_posture(struct ssam_tablet_sw *sw, u32 *state)
  		return status;
  	}
  
@@ -1934,7 +1881,124 @@ index 9fed800c7cc0..8f52b62d1c19 100644
 -- 
 2.39.2
 
-From 47f8746cc24f7add9f1ed8f95e32178c711f4de4 Mon Sep 17 00:00:00 2001
+From 32270352f1138ce75cf2e5d1e69acd8e822a8023 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sun, 19 Feb 2023 23:33:43 +0100
+Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for
+ Type-Cover posture source
+
+Implement support for the Type-Cover posture source (ID 0x00), found on
+the Surface Pro 9.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Patchset: surface-sam
+---
+ .../surface/surface_aggregator_tabletsw.c     | 57 +++++++++++++++++++
+ 1 file changed, 57 insertions(+)
+
+diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
+index e8682f52558f..8f52b62d1c19 100644
+--- a/drivers/platform/surface/surface_aggregator_tabletsw.c
++++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
+@@ -325,9 +325,18 @@ MODULE_PARM_DESC(tablet_mode_in_slate_state, "Enable tablet mode in slate device
+ #define SSAM_POS_MAX_SOURCES			4
+ 
+ enum ssam_pos_source_id {
++	SSAM_POS_SOURCE_COVER = 0x00,
+ 	SSAM_POS_SOURCE_SLS   = 0x03,
+ };
+ 
++enum ssam_pos_state_cover {
++	SSAM_POS_COVER_DISCONNECTED  = 0x01,
++	SSAM_POS_COVER_CLOSED        = 0x02,
++	SSAM_POS_COVER_LAPTOP        = 0x03,
++	SSAM_POS_COVER_FOLDED_CANVAS = 0x04,
++	SSAM_POS_COVER_FOLDED_BACK   = 0x05,
++};
++
+ enum ssam_pos_state_sls {
+ 	SSAM_POS_SLS_LID_CLOSED = 0x00,
+ 	SSAM_POS_SLS_LAPTOP     = 0x01,
+@@ -340,6 +349,30 @@ struct ssam_sources_list {
+ 	__le32 id[SSAM_POS_MAX_SOURCES];
+ } __packed;
+ 
++static const char *ssam_pos_state_name_cover(struct ssam_tablet_sw *sw, u32 state)
++{
++	switch (state) {
++	case SSAM_POS_COVER_DISCONNECTED:
++		return "disconnected";
++
++	case SSAM_POS_COVER_CLOSED:
++		return "closed";
++
++	case SSAM_POS_COVER_LAPTOP:
++		return "laptop";
++
++	case SSAM_POS_COVER_FOLDED_CANVAS:
++		return "folded-canvas";
++
++	case SSAM_POS_COVER_FOLDED_BACK:
++		return "folded-back";
++
++	default:
++		dev_warn(&sw->sdev->dev, "unknown device posture for type-cover: %u\n", state);
++		return "<unknown>";
++	}
++}
++
+ static const char *ssam_pos_state_name_sls(struct ssam_tablet_sw *sw, u32 state)
+ {
+ 	switch (state) {
+@@ -365,6 +398,9 @@ static const char *ssam_pos_state_name(struct ssam_tablet_sw *sw,
+ 				       const struct ssam_tablet_sw_state *state)
+ {
+ 	switch (state->source) {
++	case SSAM_POS_SOURCE_COVER:
++		return ssam_pos_state_name_cover(sw, state->state);
++
+ 	case SSAM_POS_SOURCE_SLS:
+ 		return ssam_pos_state_name_sls(sw, state->state);
+ 
+@@ -374,6 +410,24 @@ static const char *ssam_pos_state_name(struct ssam_tablet_sw *sw,
+ 	}
+ }
+ 
++static bool ssam_pos_state_is_tablet_mode_cover(struct ssam_tablet_sw *sw, u32 state)
++{
++	switch (state) {
++	case SSAM_POS_COVER_DISCONNECTED:
++	case SSAM_POS_COVER_FOLDED_CANVAS:
++	case SSAM_POS_COVER_FOLDED_BACK:
++		return true;
++
++	case SSAM_POS_COVER_CLOSED:
++	case SSAM_POS_COVER_LAPTOP:
++		return false;
++
++	default:
++		dev_warn(&sw->sdev->dev, "unknown device posture for type-cover: %u\n", state);
++		return true;
++	}
++}
++
+ static bool ssam_pos_state_is_tablet_mode_sls(struct ssam_tablet_sw *sw, u32 state)
+ {
+ 	switch (state) {
+@@ -397,6 +451,9 @@ static bool ssam_pos_state_is_tablet_mode(struct ssam_tablet_sw *sw,
+ 					  const struct ssam_tablet_sw_state *state)
+ {
+ 	switch (state->source) {
++	case SSAM_POS_SOURCE_COVER:
++		return ssam_pos_state_is_tablet_mode_cover(sw, state->state);
++
+ 	case SSAM_POS_SOURCE_SLS:
+ 		return ssam_pos_state_is_tablet_mode_sls(sw, state->state);
+ 
+-- 
+2.39.2
+
+From 7b29b804ebbe5b6e4b5cc642b3f3530a7bb3b3bf Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 19 Feb 2023 23:41:18 +0100
 Subject: [PATCH] platform/surface: aggregator_registry: Add support for

+ 2 - 2
patches/6.1/0007-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From 531cc2dbee920db3a563feb4f6c5a8264ef0b3d5 Mon Sep 17 00:00:00 2001
+From db04a3c8d8ccdc1acb179855181d05ac5e33074d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@@ -110,7 +110,7 @@ index 4dd777cc0c89..b2338618163a 100644
 -- 
 2.39.2
 
-From 13975b496cc9a9442a00355b644d153e324023cf Mon Sep 17 00:00:00 2001
+From e1ec82765f162e4bb81273d3ce4bca229b546b2e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 13 Feb 2021 16:41:18 +0100
 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch

+ 2 - 2
patches/6.1/0008-surface-button.patch

@@ -1,4 +1,4 @@
-From b65ae743b120e21660ec69dcf9d05708167b827a Mon Sep 17 00:00:00 2001
+From 2116eb6e4270cfd2552e8edfe2a832ede2bf3824 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:05:09 +1100
 Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
@@ -75,7 +75,7 @@ index 09489380afda..0f02411a60f1 100644
 -- 
 2.39.2
 
-From 82af5cb14a6735b86e9a8470b35f85c0bf34ce72 Mon Sep 17 00:00:00 2001
+From 94d92ee4215bb0ff3112f842f66c2f901a09bccc Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Tue, 5 Oct 2021 00:22:57 +1100
 Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd

+ 3 - 3
patches/6.1/0009-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 40514b2568d6796a613042a61f4f1c1a9f78abf0 Mon Sep 17 00:00:00 2001
+From 04db48efb9288e5d30d71b38b3f94a870ee2544f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 18 Feb 2023 01:02:49 +0100
 Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3
@@ -39,7 +39,7 @@ index 934b3d997702..2c6604c6e8e1 100644
 -- 
 2.39.2
 
-From 3e03878ff94c1faab11053687babf0fc6cf19ca3 Mon Sep 17 00:00:00 2001
+From 6e72b7444b7a3b9788fce9dfc1c5e723e98fc8dd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
@@ -272,7 +272,7 @@ index 372cbdd223e0..fe849df6a948 100644
 -- 
 2.39.2
 
-From 8ab39185d5970a9c08aa88e77c5244c708404439 Mon Sep 17 00:00:00 2001
+From 91fcba406c492c3f5aa61ee4d77ccbf9633a42c8 Mon Sep 17 00:00:00 2001
 From: PJungkamp <p.jungkamp@gmail.com>
 Date: Fri, 25 Feb 2022 12:04:25 +0100
 Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet

+ 1 - 1
patches/6.1/0010-surface-shutdown.patch

@@ -1,4 +1,4 @@
-From d3800a2dce1058415130d3007f735c446bb14809 Mon Sep 17 00:00:00 2001
+From 5f7e9026076c9d8ff1995cbfead634a6d0a9ee7b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 19 Feb 2023 22:12:24 +0100
 Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod

+ 8 - 8
patches/6.1/0011-cameras.patch

@@ -1,4 +1,4 @@
-From 3f66c54bb7cdc2bdff7190e5df83f447e734552f Mon Sep 17 00:00:00 2001
+From 1fa120985eda86fa0ce4864a312b764379daec08 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Sun, 10 Oct 2021 20:56:57 +0200
 Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
@@ -74,7 +74,7 @@ index dbfa58e799e2..ccbd3f8b523e 100644
 -- 
 2.39.2
 
-From 62264ff19af79dc149d64402792592984dd0c75e Mon Sep 17 00:00:00 2001
+From 39a862e8d2e3415bdaa86f08a30efe3d489eb210 Mon Sep 17 00:00:00 2001
 From: zouxiaoh <xiaohong.zou@intel.com>
 Date: Fri, 25 Jun 2021 08:52:59 +0800
 Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
@@ -191,7 +191,7 @@ index 408c321b929a..6e58effbe12b 100644
 -- 
 2.39.2
 
-From bcde3e84b374dddd265fe2f573db5526093519ac Mon Sep 17 00:00:00 2001
+From 90aa0a7423168a8f1ebb943a9dde9f2cbbae7752 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sun, 10 Oct 2021 20:57:02 +0200
 Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
@@ -228,7 +228,7 @@ index 5b8d1a9620a5..6a0ff035cf20 100644
 -- 
 2.39.2
 
-From a3a05f6fb9fa061a677279331a46b928e358cfcb Mon Sep 17 00:00:00 2001
+From c762de89e708f308fc3429217d16682a386e12cc Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 28 Oct 2021 21:55:16 +0100
 Subject: [PATCH] media: i2c: Add driver for DW9719 VCM
@@ -732,7 +732,7 @@ index 000000000000..180b04d2a6b3
 -- 
 2.39.2
 
-From 92bf34f3eab200885562d4c93d571c8d2d809866 Mon Sep 17 00:00:00 2001
+From 05b032434c916a273d795ef54dfdd3299d24127a Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 4 May 2022 23:21:45 +0100
 Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to
@@ -847,7 +847,7 @@ index 390bd5ea3472..76339fb842bf 100644
 -- 
 2.39.2
 
-From 7ab4524bd26746628f7589aa64de69f2feff8087 Mon Sep 17 00:00:00 2001
+From 79ea474c25b52f54220a41dae0432db9fd8a31bf Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 2 Jun 2022 22:15:56 +0100
 Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2
@@ -890,7 +890,7 @@ index 76339fb842bf..eb7aa269ec2b 100644
 -- 
 2.39.2
 
-From 91c602ca79d19d327d048844f64c7a9c79ca13f7 Mon Sep 17 00:00:00 2001
+From 2e7f52a1aeea56c4a2c2b80587546315ff3d3c4d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 15 Jul 2022 23:48:00 +0200
 Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies
@@ -919,7 +919,7 @@ index 98d081efeef7..c67966cafe10 100644
 -- 
 2.39.2
 
-From d29625db940a2c8ee8f6c8f1717512dfb4fa8650 Mon Sep 17 00:00:00 2001
+From 32ec2835df93c65c3044f88e70d5fcb2c4009043 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <dan.scally@ideasonboard.com>
 Date: Fri, 24 Feb 2023 14:03:41 +0000
 Subject: [PATCH] platform/x86: int3472: Add GPIOs to Surface Go 3 Board data

+ 2 - 2
patches/6.1/0012-amd-gpio.patch

@@ -1,4 +1,4 @@
-From 481681d33b4cb8e671018ac20594bf3d565f2e90 Mon Sep 17 00:00:00 2001
+From 739935b8c6d35fcf2481aeec4480ddd4a5ccf6d1 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 29 May 2021 17:47:38 +1000
 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
@@ -65,7 +65,7 @@ index 907cc98b1938..0116d27b29ea 100644
 -- 
 2.39.2
 
-From f1454356c009ec1d6f3e88f0365309118e227f13 Mon Sep 17 00:00:00 2001
+From a5910fa8f43db2bb75f073ecbcdec2db1176817f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Thu, 3 Jun 2021 14:04:26 +0200
 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override

+ 1 - 1
patches/6.1/0013-rtc.patch

@@ -1,4 +1,4 @@
-From af18c9f0e984b6ab4af004e0877f094064844b27 Mon Sep 17 00:00:00 2001
+From 1d1e10eef015b89c5782060b50d6d6cfd679822e Mon Sep 17 00:00:00 2001
 From: "Bart Groeneveld | GPX Solutions B.V" <bart@gpxbv.nl>
 Date: Mon, 5 Dec 2022 16:08:46 +0100
 Subject: [PATCH] acpi: allow usage of acpi_tad on HW-reduced platforms