updating 4.19 patches

This commit is contained in:
Jake Day 2019-02-16 13:26:57 -05:00
parent f44df5982b
commit 2f1570d509
11 changed files with 52 additions and 64 deletions

View file

@ -1,6 +1,6 @@
From 609aa002a34ba1417e0bf6bf5ff7dbf50c54f05b Mon Sep 17 00:00:00 2001 From 4b2a8d1a85925ac8557d2cb7df28341b9c1995cb Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:19:39 -0500 Date: Sat, 16 Feb 2019 13:23:06 -0500
Subject: [PATCH 01/11] surface-acpi Subject: [PATCH 01/11] surface-acpi
--- ---
@ -3014,5 +3014,5 @@ index 9db93f500b4e..2290d4f86ca4 100644
return -ENODEV; return -ENODEV;
-- --
2.17.1 2.19.1

View file

@ -1,6 +1,6 @@
From 112805db7e338ad74ebe888dde470c10cdaff390 Mon Sep 17 00:00:00 2001 From 435f85177927de909ca399f0935d6f5d3b2bd08f Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:20:13 -0500 Date: Sat, 16 Feb 2019 13:23:22 -0500
Subject: [PATCH 02/11] resume-delay Subject: [PATCH 02/11] resume-delay
--- ---
@ -38,7 +38,7 @@ index 0bd595a0b610..a8385e8894a5 100644
pm_notifier_call_chain(PM_POST_SUSPEND); pm_notifier_call_chain(PM_POST_SUSPEND);
pm_restore_console(); pm_restore_console();
diff --git a/kernel/sysctl.c b/kernel/sysctl.c diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index cc02050fd0c4..11802bda1a5d 100644 index 32dea29d05a0..96043d4b4b1f 100644
--- a/kernel/sysctl.c --- a/kernel/sysctl.c
+++ b/kernel/sysctl.c +++ b/kernel/sysctl.c
@@ -311,7 +311,16 @@ static int min_extfrag_threshold; @@ -311,7 +311,16 @@ static int min_extfrag_threshold;
@ -59,5 +59,5 @@ index cc02050fd0c4..11802bda1a5d 100644
.procname = "sched_child_runs_first", .procname = "sched_child_runs_first",
.data = &sysctl_sched_child_runs_first, .data = &sysctl_sched_child_runs_first,
-- --
2.17.1 2.19.1

View file

@ -1,6 +1,6 @@
From 1f80396206efaecaced8bf8ae59c74ee491877e1 Mon Sep 17 00:00:00 2001 From 4f43e03e8e589b24d0b2b48bd728d339bcc02acd Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:20:51 -0500 Date: Sat, 16 Feb 2019 13:23:35 -0500
Subject: [PATCH 03/11] buttons Subject: [PATCH 03/11] buttons
--- ---
@ -203,5 +203,5 @@ index 1b491690ce07..b67f559ee209 100644
if (!button) if (!button)
return -ENOMEM; return -ENOMEM;
-- --
2.17.1 2.19.1

View file

@ -1,6 +1,6 @@
From 1a3a6cddd988c569e56b8fe8924e8d47ab7095e5 Mon Sep 17 00:00:00 2001 From f88679313471b38edd8da78542ddc4fa68746e16 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:21:17 -0500 Date: Sat, 16 Feb 2019 13:23:47 -0500
Subject: [PATCH 04/11] cameras Subject: [PATCH 04/11] cameras
--- ---
@ -2749,5 +2749,5 @@ index 000000000000..79aef69666e8
+}; +};
+#endif +#endif
-- --
2.17.1 2.19.1

View file

@ -1,11 +1,11 @@
From f034c7d89ebb931a24345cd2003a7222a6cfcb58 Mon Sep 17 00:00:00 2001 From 9fba423120431ed30f1225d25e26e3c3882559f9 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:22:57 -0500 Date: Sat, 16 Feb 2019 13:24:10 -0500
Subject: [PATCH 05/11] ipts Subject: [PATCH 05/11] ipts
--- ---
drivers/gpu/drm/i915/Makefile | 3 + drivers/gpu/drm/i915/Makefile | 3 +
drivers/gpu/drm/i915/i915_drv.c | 19 + drivers/gpu/drm/i915/i915_drv.c | 13 +
drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_drv.h | 3 +
drivers/gpu/drm/i915/i915_gem_context.c | 12 + drivers/gpu/drm/i915/i915_gem_context.c | 12 +
drivers/gpu/drm/i915/i915_irq.c | 7 +- drivers/gpu/drm/i915/i915_irq.c | 7 +-
@ -15,7 +15,7 @@ Subject: [PATCH 05/11] ipts
drivers/gpu/drm/i915/intel_guc.h | 1 + drivers/gpu/drm/i915/intel_guc.h | 1 +
drivers/gpu/drm/i915/intel_guc_submission.c | 89 +- drivers/gpu/drm/i915/intel_guc_submission.c | 89 +-
drivers/gpu/drm/i915/intel_guc_submission.h | 4 + drivers/gpu/drm/i915/intel_guc_submission.h | 4 +
drivers/gpu/drm/i915/intel_ipts.c | 649 ++++++++++++ drivers/gpu/drm/i915/intel_ipts.c | 657 ++++++++++++
drivers/gpu/drm/i915/intel_ipts.h | 36 + drivers/gpu/drm/i915/intel_ipts.h | 36 +
drivers/gpu/drm/i915/intel_lrc.c | 12 +- drivers/gpu/drm/i915/intel_lrc.c | 12 +-
drivers/gpu/drm/i915/intel_lrc.h | 8 + drivers/gpu/drm/i915/intel_lrc.h | 8 +
@ -45,7 +45,7 @@ Subject: [PATCH 05/11] ipts
drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/hw-me-regs.h | 1 +
drivers/misc/mei/pci-me.c | 1 + drivers/misc/mei/pci-me.c | 1 +
include/linux/intel_ipts_if.h | 75 ++ include/linux/intel_ipts_if.h | 75 ++
41 files changed, 5569 insertions(+), 25 deletions(-) 41 files changed, 5571 insertions(+), 25 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_ipts.c create mode 100644 drivers/gpu/drm/i915/intel_ipts.c
create mode 100644 drivers/gpu/drm/i915/intel_ipts.h create mode 100644 drivers/gpu/drm/i915/intel_ipts.h
create mode 100644 drivers/misc/ipts/Kconfig 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_CAPTURE_ERROR) += i915_gpu_error.o
i915-$(CONFIG_DRM_I915_SELFTEST) += \ i915-$(CONFIG_DRM_I915_SELFTEST) += \
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f8cfd16be534..dc7c7e680938 100644 index f8cfd16be534..72c2f0fd2c73 100644
--- a/drivers/gpu/drm/i915/i915_drv.c --- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -53,6 +53,7 @@ @@ -53,6 +53,7 @@
@ -135,26 +135,6 @@ index f8cfd16be534..dc7c7e680938 100644
return 0; 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 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d6c25bea4382..d6b507fb7626 100644 index d6c25bea4382..d6b507fb7626 100644
--- a/drivers/gpu/drm/i915/i915_drv.h --- a/drivers/gpu/drm/i915/i915_drv.h
@ -438,10 +418,10 @@ index fb081cefef93..71fc7986585a 100644
#endif #endif
diff --git a/drivers/gpu/drm/i915/intel_ipts.c b/drivers/gpu/drm/i915/intel_ipts.c diff --git a/drivers/gpu/drm/i915/intel_ipts.c b/drivers/gpu/drm/i915/intel_ipts.c
new file mode 100644 new file mode 100644
index 000000000000..4a3efea3bac3 index 000000000000..b276a2f7839c
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/i915/intel_ipts.c +++ b/drivers/gpu/drm/i915/intel_ipts.c
@@ -0,0 +1,649 @@ @@ -0,0 +1,657 @@
+/* +/*
+ * Copyright 2016 Intel Corporation + * Copyright 2016 Intel Corporation
+ * + *
@ -1067,6 +1047,14 @@ index 000000000000..4a3efea3bac3
+ +
+ if (intel_ipts.dev == dev) { + if (intel_ipts.dev == dev) {
+ list_for_each_entry_safe(obj, n, &intel_ipts.buffers.list, list) { + list_for_each_entry_safe(obj, n, &intel_ipts.buffers.list, list) {
+ struct i915_vma *vma, *vn;
+
+ list_for_each_entry_safe(vma, vn,
+ &obj->list, obj_link) {
+ vma->flags &= ~I915_VMA_PIN_MASK;
+ i915_vma_destroy(vma);
+ }
+
+ list_del(&obj->list); + list_del(&obj->list);
+ +
+ if (!obj->gem_obj->phys_handle) + if (!obj->gem_obj->phys_handle)
@ -6077,7 +6065,7 @@ index 000000000000..1fcd02146b50
+ +
+#endif // _IPTS_H_ +#endif // _IPTS_H_
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 23739a60517f..92a2a0c5947c 100644 index bb1ee9834a02..2bbffe8aad40 100644
--- a/drivers/misc/mei/hw-me-regs.h --- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h
@@ -119,6 +119,7 @@ @@ -119,6 +119,7 @@
@ -6089,7 +6077,7 @@ index 23739a60517f..92a2a0c5947c 100644
#define MEI_DEV_ID_SPT_H_2 0xA13B /* Sunrise Point H 2 */ #define MEI_DEV_ID_SPT_H_2 0xA13B /* Sunrise Point H 2 */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index c8e21c894a5f..e26c9280d6ba 100644 index 4299658d48d6..a13fc65bb8e1 100644
--- a/drivers/misc/mei/pci-me.c --- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c
@@ -86,6 +86,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = { @@ -86,6 +86,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
@ -6182,5 +6170,5 @@ index 000000000000..f329bbfb8079
+ +
+#endif // INTEL_IPTS_IF_H +#endif // INTEL_IPTS_IF_H
-- --
2.17.1 2.19.1

View file

@ -1,6 +1,6 @@
From 9d849efa4cfe9459b6518de9247f765883245983 Mon Sep 17 00:00:00 2001 From 19955c9c2cd9563a81b1c8fb918f5ea94e8c8d45 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:27:09 -0500 Date: Sat, 16 Feb 2019 13:24:25 -0500
Subject: [PATCH 06/11] hid Subject: [PATCH 06/11] hid
--- ---
@ -147,5 +147,5 @@ index 77316f022c5a..12b4e94232cc 100644
{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
{ HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },
-- --
2.17.1 2.19.1

View file

@ -1,6 +1,6 @@
From 612fb689ca8e2dd5bac773d2fd232328ac8d28ff Mon Sep 17 00:00:00 2001 From e8dfbab5b983d3b8dfa9cd4fa04916a5a7a94731 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:27:34 -0500 Date: Sat, 16 Feb 2019 13:24:38 -0500
Subject: [PATCH 07/11] sdcard-reader Subject: [PATCH 07/11] sdcard-reader
--- ---
@ -8,10 +8,10 @@ Subject: [PATCH 07/11] sdcard-reader
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index cc62707c0251..caed42b72daf 100644 index 3adff4da2ee1..7980accfe9df 100644
--- a/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c
@@ -4150,7 +4150,8 @@ void usb_enable_lpm(struct usb_device *udev) @@ -4160,7 +4160,8 @@ void usb_enable_lpm(struct usb_device *udev)
if (!udev || !udev->parent || if (!udev || !udev->parent ||
udev->speed < USB_SPEED_SUPER || udev->speed < USB_SPEED_SUPER ||
!udev->lpm_capable || !udev->lpm_capable ||
@ -22,5 +22,5 @@ index cc62707c0251..caed42b72daf 100644
udev->lpm_disable_count--; udev->lpm_disable_count--;
-- --
2.17.1 2.19.1

View file

@ -1,6 +1,6 @@
From 66a3b4f81d65e9589beefdbe4ec6a2708a28a3cc Mon Sep 17 00:00:00 2001 From f64170f4656270df858540ec51ed9398d46a4aaa Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:41:55 -0500 Date: Sat, 16 Feb 2019 13:24:50 -0500
Subject: [PATCH 08/11] wifi Subject: [PATCH 08/11] wifi
--- ---
@ -250,5 +250,5 @@ diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
old mode 100755 old mode 100755
new mode 100644 new mode 100644
-- --
2.17.1 2.19.1

View file

@ -1,6 +1,6 @@
From 2563a91a5ef798d7c87fdbddd2ff3208da488dff Mon Sep 17 00:00:00 2001 From 231f570c3fa8118037f6de384b4d611d85e5a99b Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:42:28 -0500 Date: Sat, 16 Feb 2019 13:25:03 -0500
Subject: [PATCH 09/11] surface3-power Subject: [PATCH 09/11] surface3-power
--- ---
@ -749,5 +749,5 @@ index 000000000000..6d59c7f6e4a5
+MODULE_DESCRIPTION("mshw0011 driver"); +MODULE_DESCRIPTION("mshw0011 driver");
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
-- --
2.17.1 2.19.1

View file

@ -1,6 +1,6 @@
From aca091df5dbc8ca28655d01ed25e08c6b5ff6af7 Mon Sep 17 00:00:00 2001 From 5be971018c8f6296151923f28712204ebb7da330 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:42:58 -0500 Date: Sat, 16 Feb 2019 13:25:15 -0500
Subject: [PATCH 10/11] surface-dock Subject: [PATCH 10/11] surface-dock
--- ---
@ -21,5 +21,5 @@ index 8bc35d53408b..11fa56cbd769 100644
{ USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT },
{ USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT },
-- --
2.17.1 2.19.1

View file

@ -1,6 +1,6 @@
From f7f558f652259df3c5a6e19a36c3712e7c231bae Mon Sep 17 00:00:00 2001 From ed4a21ea220f9914bf3aa8b565ee49299f48e492 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com> From: Jake Day <jake@ninebysix.com>
Date: Thu, 7 Feb 2019 07:43:24 -0500 Date: Sat, 16 Feb 2019 13:25:27 -0500
Subject: [PATCH 11/11] mwlwifi Subject: [PATCH 11/11] mwlwifi
--- ---
@ -19751,5 +19751,5 @@ index 000000000000..b6fdf70c22fb
+ +
+#endif /* _VENDOR_CMD_H_ */ +#endif /* _VENDOR_CMD_H_ */
-- --
2.17.1 2.19.1