Update v6.1 patches
Changes:
- Rebase onto v6.1.6
Links:
- kernel: 36ee5552bf
This commit is contained in:
Maximilian Luz
parent
487e64047c
commit
ea163d9178
|
|
@ -1,4 +1,4 @@
|
|||
From b1ce7e2a0ea543867d0aa1dd7a5d23dad9336a73 Mon Sep 17 00:00:00 2001
|
||||
From 19b8ce192055bdeca49b476a88bd5d694c54bbf7 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From f68e13904fe89824383047ad407cdf2868c0c644 Mon Sep 17 00:00:00 2001
|
||||
From ab8029b679353ff413840f06959039119731599a 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.0
|
||||
|
||||
From 14ecac240936e807dd2366c70cdf9d108a5b8f40 Mon Sep 17 00:00:00 2001
|
||||
From 38ad493a42fa7e93cee10d17640a39eea0ecba97 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.0
|
||||
|
||||
From 2aa594c47d5d32cba044b4b249c7b191d4c5c2e3 Mon Sep 17 00:00:00 2001
|
||||
From 73bd3c344cd15dad5095585d51d0f07a7ae0eaf5 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,4 +1,4 @@
|
|||
From 272e87cedc1e0b5c51e54c99e36f667c731d0dbb Mon Sep 17 00:00:00 2001
|
||||
From 8516237f9b2afa49f7b8f1d9e5ffc5be4a83c512 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 6152dcef77a334b7844aa565275902111194a78f Mon Sep 17 00:00:00 2001
|
||||
From 42fabf8dcff992959f7e261a13779ba9eb757780 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 704cd0caa172..b4dc3fddd20d 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From 81499f96035b9144633c1dd0942610ad9f4b0dce Mon Sep 17 00:00:00 2001
|
||||
From 72fed1d44ac9a6ba0669e20fd617b6330af1634e Mon Sep 17 00:00:00 2001
|
||||
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
||||
Date: Thu, 6 Aug 2020 11:20:41 +0200
|
||||
Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus
|
||||
|
|
@ -1501,7 +1501,7 @@ index 000000000000..53fb86a88f97
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From 1b39126e5e54ffd417c985ca1e08736fca1a51ee Mon Sep 17 00:00:00 2001
|
||||
From e3eebbc271fccaa8579b04b340f4b4b01d54ec61 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From cb437b5308cb73255a86b0a6f1f5e1178d8533f0 Mon Sep 17 00:00:00 2001
|
||||
From 9e44cdad03a46c1f08f3be86173c118c6db561c6 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 21:23:53 +0100
|
||||
Subject: [PATCH] platform/surface: aggregator: Improve documentation and
|
||||
|
|
@ -261,7 +261,7 @@ index 45501b6e54e8..5c4ae1a26183 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From e925dfd94cac673e7327260fd876a96e6fbb50a0 Mon Sep 17 00:00:00 2001
|
||||
From 29ac02c869e3070532fa9f6a947dbde5125afe2d Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 21:30:58 +0100
|
||||
Subject: [PATCH] platform/surface: aggregator: Ignore command messages not
|
||||
|
|
@ -334,7 +334,7 @@ index f5565570f16c..90634dcacabf 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From ff41cec74dd5826fd4ea5b8f6627bfbe3743e1e6 Mon Sep 17 00:00:00 2001
|
||||
From 7b80425cbcee6aeac0cf312367c1f98df72f2093 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 21:42:19 +0100
|
||||
Subject: [PATCH] platform/surface: aggregator: Add target and source IDs to
|
||||
|
|
@ -528,7 +528,7 @@ index 2a2c17771d01..55cc61bba1da 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From 698898dad24512d70a21ab78844e617486028a25 Mon Sep 17 00:00:00 2001
|
||||
From 28f119067bd5982c043f3822b01a864e60d6ec54 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 21:32:16 +0100
|
||||
Subject: [PATCH] platform/surface: aggregator_hub: Use target-ID enum instead
|
||||
|
|
@ -568,7 +568,7 @@ index 43061514be38..62f27cdb6ca8 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From 3c5d1c4ef943afa97f68879843797aff93f62395 Mon Sep 17 00:00:00 2001
|
||||
From e9cc6b4179e0e913d5203273742b0ad40f9da048 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 21:33:26 +0100
|
||||
Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum
|
||||
|
|
@ -617,7 +617,7 @@ index 27d95a6a7851..bd8cd453c393 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From cbe57259ff7b94af0ae62170a9814594fe1f6705 Mon Sep 17 00:00:00 2001
|
||||
From 118efac5894275e2910b1e6a7764da49ef78a017 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 21:34:06 +0100
|
||||
Subject: [PATCH] platform/surface: dtx: Use target-ID enum instead of
|
||||
|
|
@ -712,7 +712,7 @@ index ed36944467f9..0de76a784a35 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From f79e434b9f3851364689210195aea86a1720c466 Mon Sep 17 00:00:00 2001
|
||||
From 1bf091f4db2f290dc82252ae0479f92e37dc87b0 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 21:40:06 +0100
|
||||
Subject: [PATCH] HID: surface-hid: Use target-ID enum instead of hard-coding
|
||||
|
|
@ -743,7 +743,7 @@ index 0635341bc517..42933bf3e925 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From 495ca177f24e437bfd86c75057f120e4c836149c Mon Sep 17 00:00:00 2001
|
||||
From 9530d700f41edbddd880d2bec9e3b6547de811f3 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 21:45:28 +0100
|
||||
Subject: [PATCH] platform/surface: aggregator: Enforce use of target-ID enum
|
||||
|
|
@ -975,7 +975,7 @@ index 46c45d1b6368..4da20b7a0ee5 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From edf30b3b5d55e5b3d8064d2edc60b594fe684a3b Mon Sep 17 00:00:00 2001
|
||||
From f905337cf4c31e3cc429b94ab9586b370b882c23 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 21:46:37 +0100
|
||||
Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 0d55229782727243733f867a6b8148276d63fdd3 Mon Sep 17 00:00:00 2001
|
||||
From e17056688f8040ace8f60ee7a5ebc4e196ae6b0d 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.0
|
||||
|
||||
From f65d13f177fe2c309ad238254caaae4e4312cefd Mon Sep 17 00:00:00 2001
|
||||
From 725ce85d616e7b985208e32426c41a95a33c4005 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 183996b2e1e626c5c40a986fa25084b11429daa5 Mon Sep 17 00:00:00 2001
|
||||
From 0f45b177ca4e7d9b62c0f7572e273104fe93f274 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.0
|
||||
|
||||
From 87897dbc255aaac49a53478463e1f7d23f3e5622 Mon Sep 17 00:00:00 2001
|
||||
From bff73a6735c9eba68a048fa321c371714d5817f6 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 172e2d4a0907bdf22b8bc6d7468c96481a7f355a Mon Sep 17 00:00:00 2001
|
||||
From dc3a1664b024f9f8051f65ee84edf5391460dbc4 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
|
||||
|
|
@ -231,7 +231,7 @@ index 372cbdd223e0..fe849df6a948 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From 0a6239b736a59c94c1039d2c1fc553e450b3f721 Mon Sep 17 00:00:00 2001
|
||||
From 88620b36eb8e96c20001aaeda03ad290cbabf43e 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,4 +1,4 @@
|
|||
From dd4e87b9c7f4930a07b93c73b4d85de6282c9910 Mon Sep 17 00:00:00 2001
|
||||
From d7034b752abab1bc8bbeae6bec214434a59e9a43 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 b47e93a24a9a..22c921886cbe 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From 04d727b390677c247ce35cd3c459a9706c92149b Mon Sep 17 00:00:00 2001
|
||||
From b7ae48c658abca801fb92cc6c734a3e3726ede8a 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.0
|
||||
|
||||
From aab7172afbd549a758e01f936b9a6683ba59b474 Mon Sep 17 00:00:00 2001
|
||||
From b8246f77d572fe16b5cd53acf2473cb6eddcaddc 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.0
|
||||
|
||||
From c429d67a19c8860fd3b7f7b0a4f95fa465028fe6 Mon Sep 17 00:00:00 2001
|
||||
From 75d54e3be5ceb01b46d74e3e9d3af3f88d7a2669 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.0
|
||||
|
||||
From dec3b71065ccf948d1d4830e46adad41ac134195 Mon Sep 17 00:00:00 2001
|
||||
From 0611d5aa6bb68362b37dc6dc310050ed2d16bd64 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.0
|
||||
|
||||
From 1020ddb552417b2af335b0ad73efafad56cdd039 Mon Sep 17 00:00:00 2001
|
||||
From 65a24c651f437949aaa6cd640bf8318d747a92ce 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.0
|
||||
|
||||
From f27e3ae91e4d86ceb751029090de793847022949 Mon Sep 17 00:00:00 2001
|
||||
From c07d00b78e9792663f36a8f57444fc9b4e66a0d8 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,134 +919,3 @@ index 98d081efeef7..c67966cafe10 100644
|
|||
--
|
||||
2.39.0
|
||||
|
||||
From b5235eb7d37be79d8e6d50e02bba67a48dae90f0 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Wed, 7 Sep 2022 15:38:08 +0200
|
||||
Subject: [PATCH] ipu3-imgu: Fix NULL pointer dereference in
|
||||
imgu_subdev_set_selection()
|
||||
|
||||
Calling v4l2_subdev_get_try_crop() and v4l2_subdev_get_try_compose()
|
||||
with a subdev state of NULL leads to a NULL pointer dereference. This
|
||||
can currently happen in imgu_subdev_set_selection() when the state
|
||||
passed in is NULL, as this method first gets pointers to both the "try"
|
||||
and "active" states and only then decides which to use.
|
||||
|
||||
The same issue has been addressed for imgu_subdev_get_selection() with
|
||||
commit 30d03a0de650 ("ipu3-imgu: Fix NULL pointer dereference in active
|
||||
selection access"). However the issue still persists in
|
||||
imgu_subdev_set_selection().
|
||||
|
||||
Therefore, apply a similar fix as done in the aforementioned commit to
|
||||
imgu_subdev_set_selection(). To keep things a bit cleaner, introduce
|
||||
helper functions for "crop" and "compose" access and use them in both
|
||||
imgu_subdev_set_selection() and imgu_subdev_get_selection().
|
||||
|
||||
Fixes: 0d346d2a6f54 ("media: v4l2-subdev: add subdev-wide state struct")
|
||||
Cc: stable@vger.kernel.org # for v5.14 and later
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: cameras
|
||||
---
|
||||
drivers/staging/media/ipu3/ipu3-v4l2.c | 57 +++++++++++++++-----------
|
||||
1 file changed, 34 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
|
||||
index ce13e746c15f..e530767e80a5 100644
|
||||
--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
|
||||
+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
|
||||
@@ -188,6 +188,28 @@ static int imgu_subdev_set_fmt(struct v4l2_subdev *sd,
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static struct v4l2_rect *
|
||||
+imgu_subdev_get_crop(struct imgu_v4l2_subdev *sd,
|
||||
+ struct v4l2_subdev_state *sd_state, unsigned int pad,
|
||||
+ enum v4l2_subdev_format_whence which)
|
||||
+{
|
||||
+ if (which == V4L2_SUBDEV_FORMAT_TRY)
|
||||
+ return v4l2_subdev_get_try_crop(&sd->subdev, sd_state, pad);
|
||||
+ else
|
||||
+ return &sd->rect.eff;
|
||||
+}
|
||||
+
|
||||
+static struct v4l2_rect *
|
||||
+imgu_subdev_get_compose(struct imgu_v4l2_subdev *sd,
|
||||
+ struct v4l2_subdev_state *sd_state, unsigned int pad,
|
||||
+ enum v4l2_subdev_format_whence which)
|
||||
+{
|
||||
+ if (which == V4L2_SUBDEV_FORMAT_TRY)
|
||||
+ return v4l2_subdev_get_try_compose(&sd->subdev, sd_state, pad);
|
||||
+ else
|
||||
+ return &sd->rect.bds;
|
||||
+}
|
||||
+
|
||||
static int imgu_subdev_get_selection(struct v4l2_subdev *sd,
|
||||
struct v4l2_subdev_state *sd_state,
|
||||
struct v4l2_subdev_selection *sel)
|
||||
@@ -200,18 +222,12 @@ static int imgu_subdev_get_selection(struct v4l2_subdev *sd,
|
||||
|
||||
switch (sel->target) {
|
||||
case V4L2_SEL_TGT_CROP:
|
||||
- if (sel->which == V4L2_SUBDEV_FORMAT_TRY)
|
||||
- sel->r = *v4l2_subdev_get_try_crop(sd, sd_state,
|
||||
- sel->pad);
|
||||
- else
|
||||
- sel->r = imgu_sd->rect.eff;
|
||||
+ sel->r = *imgu_subdev_get_crop(imgu_sd, sd_state, sel->pad,
|
||||
+ sel->which);
|
||||
return 0;
|
||||
case V4L2_SEL_TGT_COMPOSE:
|
||||
- if (sel->which == V4L2_SUBDEV_FORMAT_TRY)
|
||||
- sel->r = *v4l2_subdev_get_try_compose(sd, sd_state,
|
||||
- sel->pad);
|
||||
- else
|
||||
- sel->r = imgu_sd->rect.bds;
|
||||
+ sel->r = *imgu_subdev_get_compose(imgu_sd, sd_state, sel->pad,
|
||||
+ sel->which);
|
||||
return 0;
|
||||
default:
|
||||
return -EINVAL;
|
||||
@@ -223,10 +239,9 @@ static int imgu_subdev_set_selection(struct v4l2_subdev *sd,
|
||||
struct v4l2_subdev_selection *sel)
|
||||
{
|
||||
struct imgu_device *imgu = v4l2_get_subdevdata(sd);
|
||||
- struct imgu_v4l2_subdev *imgu_sd = container_of(sd,
|
||||
- struct imgu_v4l2_subdev,
|
||||
- subdev);
|
||||
- struct v4l2_rect *rect, *try_sel;
|
||||
+ struct imgu_v4l2_subdev *imgu_sd =
|
||||
+ container_of(sd, struct imgu_v4l2_subdev, subdev);
|
||||
+ struct v4l2_rect *rect;
|
||||
|
||||
dev_dbg(&imgu->pci_dev->dev,
|
||||
"set subdev %u sel which %u target 0x%4x rect [%ux%u]",
|
||||
@@ -238,22 +253,18 @@ static int imgu_subdev_set_selection(struct v4l2_subdev *sd,
|
||||
|
||||
switch (sel->target) {
|
||||
case V4L2_SEL_TGT_CROP:
|
||||
- try_sel = v4l2_subdev_get_try_crop(sd, sd_state, sel->pad);
|
||||
- rect = &imgu_sd->rect.eff;
|
||||
+ rect = imgu_subdev_get_crop(imgu_sd, sd_state, sel->pad,
|
||||
+ sel->which);
|
||||
break;
|
||||
case V4L2_SEL_TGT_COMPOSE:
|
||||
- try_sel = v4l2_subdev_get_try_compose(sd, sd_state, sel->pad);
|
||||
- rect = &imgu_sd->rect.bds;
|
||||
+ rect = imgu_subdev_get_compose(imgu_sd, sd_state, sel->pad,
|
||||
+ sel->which);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- if (sel->which == V4L2_SUBDEV_FORMAT_TRY)
|
||||
- *try_sel = sel->r;
|
||||
- else
|
||||
- *rect = sel->r;
|
||||
-
|
||||
+ *rect = sel->r;
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.39.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From aaff0863024578f7f6fe91573c68778ad0aec98e Mon Sep 17 00:00:00 2001
|
||||
From 4e0cf6e05dd0de32045adcc2087f4ed7c9a184e7 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.0
|
||||
|
||||
From 9d4e2bb0f9856ce57029c89895b38ae5949502f5 Mon Sep 17 00:00:00 2001
|
||||
From 94f476cef8457ab5cba6109ee104608eba7e8072 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,4 +1,4 @@
|
|||
From dcf0efd363e301c409bfccb2ea3119e5d3fa3e52 Mon Sep 17 00:00:00 2001
|
||||
From ad11ec823a7792d636492a9f99dfaf7bd7842f0d 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
|
||||
|
|
|
|||
Loading…
Reference in a new issue