updating 4.19 patches
This commit is contained in:
Jake Day
parent
787756bd11
commit
5b7dd5a7a9
|
|
@ -1,6 +1,6 @@
|
|||
From abc12b08a5ed535d8b90ee872285ac4c2d7900e2 Mon Sep 17 00:00:00 2001
|
||||
From 609aa002a34ba1417e0bf6bf5ff7dbf50c54f05b Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:10:25 -0500
|
||||
Date: Thu, 7 Feb 2019 07:19:39 -0500
|
||||
Subject: [PATCH 01/11] surface-acpi
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From bf9a099e7fb9f6763f2e496ed427c3edff5f4287 Mon Sep 17 00:00:00 2001
|
||||
From 112805db7e338ad74ebe888dde470c10cdaff390 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:10:41 -0500
|
||||
Date: Thu, 7 Feb 2019 07:20:13 -0500
|
||||
Subject: [PATCH 02/11] resume-delay
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From af713d0a271a61240e243cee1ddf0041d4f67430 Mon Sep 17 00:00:00 2001
|
||||
From 1f80396206efaecaced8bf8ae59c74ee491877e1 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:10:55 -0500
|
||||
Date: Thu, 7 Feb 2019 07:20:51 -0500
|
||||
Subject: [PATCH 03/11] buttons
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 2579f4b899ab98b1e434bf9485de83300d9b2663 Mon Sep 17 00:00:00 2001
|
||||
From 1a3a6cddd988c569e56b8fe8924e8d47ab7095e5 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:11:08 -0500
|
||||
Date: Thu, 7 Feb 2019 07:21:17 -0500
|
||||
Subject: [PATCH 04/11] cameras
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
From ffdb2838f469f74fbf2724b9fcd0a65c6cb0ffde Mon Sep 17 00:00:00 2001
|
||||
From f034c7d89ebb931a24345cd2003a7222a6cfcb58 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:11:31 -0500
|
||||
Date: Thu, 7 Feb 2019 07:22:57 -0500
|
||||
Subject: [PATCH 05/11] ipts
|
||||
|
||||
---
|
||||
drivers/gpu/drm/i915/Makefile | 3 +
|
||||
drivers/gpu/drm/i915/i915_drv.c | 13 +
|
||||
drivers/gpu/drm/i915/i915_drv.c | 19 +
|
||||
drivers/gpu/drm/i915/i915_drv.h | 3 +
|
||||
drivers/gpu/drm/i915/i915_gem_context.c | 12 +
|
||||
drivers/gpu/drm/i915/i915_irq.c | 7 +-
|
||||
|
|
@ -45,7 +45,7 @@ Subject: [PATCH 05/11] ipts
|
|||
drivers/misc/mei/hw-me-regs.h | 1 +
|
||||
drivers/misc/mei/pci-me.c | 1 +
|
||||
include/linux/intel_ipts_if.h | 75 ++
|
||||
41 files changed, 5563 insertions(+), 25 deletions(-)
|
||||
41 files changed, 5569 insertions(+), 25 deletions(-)
|
||||
create mode 100644 drivers/gpu/drm/i915/intel_ipts.c
|
||||
create mode 100644 drivers/gpu/drm/i915/intel_ipts.h
|
||||
create mode 100644 drivers/misc/ipts/Kconfig
|
||||
|
|
@ -84,7 +84,7 @@ index 5794f102f9b8..6ae0e91a213a 100644
|
|||
i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
|
||||
i915-$(CONFIG_DRM_I915_SELFTEST) += \
|
||||
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
|
||||
index f8cfd16be534..72c2f0fd2c73 100644
|
||||
index f8cfd16be534..dc7c7e680938 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_drv.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_drv.c
|
||||
@@ -53,6 +53,7 @@
|
||||
|
|
@ -135,6 +135,26 @@ index f8cfd16be534..72c2f0fd2c73 100644
|
|||
return 0;
|
||||
}
|
||||
|
||||
@@ -2593,6 +2606,9 @@ static int intel_runtime_suspend(struct device *kdev)
|
||||
|
||||
DRM_DEBUG_KMS("Suspending device\n");
|
||||
|
||||
+ if (INTEL_GEN(dev_priv) >= 9 && i915_modparams.enable_guc && i915_modparams.enable_ipts)
|
||||
+ intel_ipts_suspend(dev);
|
||||
+
|
||||
disable_rpm_wakeref_asserts(dev_priv);
|
||||
|
||||
/*
|
||||
@@ -2730,6 +2746,9 @@ static int intel_runtime_resume(struct device *kdev)
|
||||
|
||||
enable_rpm_wakeref_asserts(dev_priv);
|
||||
|
||||
+ if (INTEL_GEN(dev_priv) >= 9 && i915_modparams.enable_guc && i915_modparams.enable_ipts)
|
||||
+ intel_ipts_resume(dev);
|
||||
+
|
||||
if (ret)
|
||||
DRM_ERROR("Runtime resume failed, disabling it (%d)\n", ret);
|
||||
else
|
||||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
|
||||
index d6c25bea4382..d6b507fb7626 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_drv.h
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
From 7ca1ed7d248ac352163159c884049b33ac3f9db1 Mon Sep 17 00:00:00 2001
|
||||
From 9d849efa4cfe9459b6518de9247f765883245983 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:11:43 -0500
|
||||
Date: Thu, 7 Feb 2019 07:27:09 -0500
|
||||
Subject: [PATCH 06/11] hid
|
||||
|
||||
---
|
||||
drivers/hid/hid-ids.h | 20 ++++++++++----
|
||||
drivers/hid/hid-microsoft.c | 3 ++-
|
||||
drivers/hid/hid-multitouch.c | 52 ++++++++++++++++++++++++++++++++++++
|
||||
drivers/hid/hid-quirks.c | 10 +++++++
|
||||
4 files changed, 79 insertions(+), 6 deletions(-)
|
||||
drivers/hid/hid-ids.h | 21 +++++++++----
|
||||
drivers/hid/hid-microsoft.c | 3 +-
|
||||
drivers/hid/hid-multitouch.c | 57 ++++++++++++++++++++++++++++++++++++
|
||||
drivers/hid/hid-quirks.c | 11 +++++++
|
||||
4 files changed, 86 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index b7870e7e41d4..2ad517f1c1fe 100644
|
||||
index b7870e7e41d4..5e6e81340be8 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -800,11 +800,21 @@
|
||||
@@ -800,11 +800,22 @@
|
||||
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
|
||||
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600 0x0750
|
||||
#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c
|
||||
|
|
@ -36,6 +36,7 @@ index b7870e7e41d4..2ad517f1c1fe 100644
|
|||
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1 0x07e4
|
||||
+#define USB_DEVICE_ID_MS_SURFACE_BOOK 0x07cd
|
||||
+#define USB_DEVICE_ID_MS_SURFACE_BOOK_2 0x0922
|
||||
+#define USB_DEVICE_ID_MS_SURFACE_GO 0x096f
|
||||
+#define USB_DEVICE_ID_MS_SURFACE_VHF 0xf001
|
||||
+#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
|
||||
#define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb
|
||||
|
|
@ -56,10 +57,10 @@ index 72d983626afd..133395b45022 100644
|
|||
.driver_data = MS_PRESENTER },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B),
|
||||
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
||||
index 831617c386e6..1953d21398cf 100644
|
||||
index 831617c386e6..21337070068a 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -1978,6 +1978,58 @@ static const struct hid_device_id mt_devices[] = {
|
||||
@@ -1978,6 +1978,63 @@ static const struct hid_device_id mt_devices[] = {
|
||||
HID_USB_DEVICE(USB_VENDOR_ID_LG,
|
||||
USB_DEVICE_ID_LG_MELFAS_MT) },
|
||||
|
||||
|
|
@ -104,6 +105,11 @@ index 831617c386e6..1953d21398cf 100644
|
|||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_SURFACE_BOOK_2) },
|
||||
+
|
||||
+ /* Microsoft Surface Go */
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_SURFACE_GO) },
|
||||
+
|
||||
+ /* Microsoft Surface Laptop */
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
||||
|
|
@ -119,10 +125,10 @@ index 831617c386e6..1953d21398cf 100644
|
|||
{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
|
||||
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
|
||||
index 77316f022c5a..2d4aafb92d85 100644
|
||||
index 77316f022c5a..12b4e94232cc 100644
|
||||
--- a/drivers/hid/hid-quirks.c
|
||||
+++ b/drivers/hid/hid-quirks.c
|
||||
@@ -111,6 +111,16 @@ static const struct hid_device_id hid_quirks[] = {
|
||||
@@ -111,6 +111,17 @@ static const struct hid_device_id hid_quirks[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
|
||||
|
|
@ -135,6 +141,7 @@ index 77316f022c5a..2d4aafb92d85 100644
|
|||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK_2), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_GO), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF), HID_QUIRK_ALWAYS_POLL },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER), HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 998c06863b57818ed29ca9d6cfbbda39c36c2a04 Mon Sep 17 00:00:00 2001
|
||||
From 612fb689ca8e2dd5bac773d2fd232328ac8d28ff Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:11:56 -0500
|
||||
Date: Thu, 7 Feb 2019 07:27:34 -0500
|
||||
Subject: [PATCH 07/11] sdcard-reader
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 6b592ac2fb808cc68d3d7fb65039ce6795636226 Mon Sep 17 00:00:00 2001
|
||||
From 66a3b4f81d65e9589beefdbe4ec6a2708a28a3cc Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:12:13 -0500
|
||||
Date: Thu, 7 Feb 2019 07:41:55 -0500
|
||||
Subject: [PATCH 08/11] wifi
|
||||
|
||||
---
|
||||
|
|
@ -11,11 +11,11 @@ Subject: [PATCH 08/11] wifi
|
|||
drivers/net/wireless/marvell/mwifiex/main.c | 17 +++++++++++++----
|
||||
drivers/net/wireless/marvell/mwifiex/main.h | 2 ++
|
||||
drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +++++++++
|
||||
drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 2 +-
|
||||
drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 4 ++--
|
||||
.../net/wireless/marvell/mwifiex/sta_cmdresp.c | 11 ++++++++---
|
||||
drivers/net/wireless/marvell/mwifiex/usb.c | 2 ++
|
||||
scripts/leaking_addresses.pl | 0
|
||||
11 files changed, 43 insertions(+), 11 deletions(-)
|
||||
11 files changed, 44 insertions(+), 12 deletions(-)
|
||||
mode change 100755 => 100644 scripts/leaking_addresses.pl
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
|
||||
|
|
@ -197,15 +197,17 @@ index 3fe81b2a929a..6e734a83e6bf 100644
|
|||
skb_trim(skb, rx_len);
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||
index 4ed10cf82f9a..3218a8f3d91f 100644
|
||||
index 4ed10cf82f9a..485360e8534b 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||
@@ -31,7 +31,7 @@ module_param(drcs, bool, 0644);
|
||||
@@ -30,8 +30,8 @@ static bool drcs;
|
||||
module_param(drcs, bool, 0644);
|
||||
MODULE_PARM_DESC(drcs, "multi-channel operation:1, single-channel operation:0");
|
||||
|
||||
static bool disable_auto_ds;
|
||||
-static bool disable_auto_ds;
|
||||
-module_param(disable_auto_ds, bool, 0);
|
||||
+module_param(disable_auto_ds, bool, 1);
|
||||
+static bool disable_auto_ds = 1;
|
||||
+module_param(disable_auto_ds, bool, 0644);
|
||||
MODULE_PARM_DESC(disable_auto_ds,
|
||||
"deepsleep enabled=0(default), deepsleep disabled=1");
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 4da845b6d08e9200a2cbc60b1b4b3a22be5da1d3 Mon Sep 17 00:00:00 2001
|
||||
From 2563a91a5ef798d7c87fdbddd2ff3208da488dff Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:12:28 -0500
|
||||
Date: Thu, 7 Feb 2019 07:42:28 -0500
|
||||
Subject: [PATCH 09/11] surface3-power
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From b9220a9addf9cedfb248f1dc722260a7570bee26 Mon Sep 17 00:00:00 2001
|
||||
From aca091df5dbc8ca28655d01ed25e08c6b5ff6af7 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:12:41 -0500
|
||||
Date: Thu, 7 Feb 2019 07:42:58 -0500
|
||||
Subject: [PATCH 10/11] surface-dock
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 833f006fdc664850fa9feeb79d79bc6e6493584a Mon Sep 17 00:00:00 2001
|
||||
From f7f558f652259df3c5a6e19a36c3712e7c231bae Mon Sep 17 00:00:00 2001
|
||||
From: Jake Day <jake@ninebysix.com>
|
||||
Date: Thu, 31 Jan 2019 07:12:54 -0500
|
||||
Date: Thu, 7 Feb 2019 07:43:24 -0500
|
||||
Subject: [PATCH 11/11] mwlwifi
|
||||
|
||||
---
|
||||
|
|
|
|||
Loading…
Reference in a new issue