beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove unnecessary changes in ACPI/serdev patches

Browse source
This commit is contained in:
qzed 2019-09-17 16:04:00 +02:00 committed by Maximilian Luz
parent 03e4a8dff3
commit 292b082b29
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
24 changed files with 156 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
patches/4.19/0001-surface-acpi.patch
View file

@ -1,4 +1,4 @@
From fa76ab4055175cad9c3ae34fed2257f2d7346fac Mon Sep 17 00:00:00 2001 From 8f120efa25f58bc8b842cdacb1358f7c7d9ecc18 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:40:41 +0200 Date: Fri, 26 Jul 2019 03:40:41 +0200
Subject: [PATCH 01/12] surface-acpi Subject: [PATCH 01/12] surface-acpi
@ -9,8 +9,8 @@ Subject: [PATCH 01/12] surface-acpi
drivers/platform/x86/Kconfig | 97 + drivers/platform/x86/Kconfig | 97 +
drivers/platform/x86/Makefile | 1 + drivers/platform/x86/Makefile | 1 +
drivers/platform/x86/surface_acpi.c | 3913 +++++++++++++++++++++++++++ drivers/platform/x86/surface_acpi.c | 3913 +++++++++++++++++++++++++++
drivers/tty/serdev/core.c | 90 +- drivers/tty/serdev/core.c | 87 +
6 files changed, 4110 insertions(+), 19 deletions(-) 6 files changed, 4109 insertions(+), 17 deletions(-)
create mode 100644 drivers/platform/x86/surface_acpi.c create mode 100644 drivers/platform/x86/surface_acpi.c
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
@ -4119,20 +4119,10 @@ index 000000000000..f62aecb0df69
+MODULE_DESCRIPTION("ACPI/Platform Drivers for Microsoft Surface Devices"); +MODULE_DESCRIPTION("ACPI/Platform Drivers for Microsoft Surface Devices");
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c
index 9db93f500b4e..2290d4f86ca4 100644 index 9db93f500b4e..9cfb5ffc034f 100644
--- a/drivers/tty/serdev/core.c --- a/drivers/tty/serdev/core.c
+++ b/drivers/tty/serdev/core.c +++ b/drivers/tty/serdev/core.c
@@ -502,8 +502,7 @@ static acpi_status acpi_serdev_register_device(struct serdev_controller *ctrl, @@ -526,6 +526,81 @@ static acpi_status acpi_serdev_register_device(struct serdev_controller *ctrl,
struct serdev_device *serdev = NULL;
int err;
- if (acpi_bus_get_status(adev) || !adev->status.present ||
- acpi_device_enumerated(adev))
+ if (acpi_bus_get_status(adev) || !adev->status.present)
return AE_OK;
serdev = serdev_device_alloc(ctrl);
@@ -526,6 +525,81 @@ static acpi_status acpi_serdev_register_device(struct serdev_controller *ctrl,
return AE_OK; return AE_OK;
} }
@ -4214,7 +4204,7 @@ index 9db93f500b4e..2290d4f86ca4 100644
static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level, static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level,
void *data, void **return_value) void *data, void **return_value)
{ {
@@ -535,6 +609,9 @@ static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level, @@ -535,6 +610,9 @@ static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level,
if (acpi_bus_get_device(handle, &adev)) if (acpi_bus_get_device(handle, &adev))
return AE_OK; return AE_OK;
@ -4224,7 +4214,7 @@ index 9db93f500b4e..2290d4f86ca4 100644
return acpi_serdev_register_device(ctrl, adev); return acpi_serdev_register_device(ctrl, adev);
} }
@@ -552,6 +629,15 @@ static int acpi_serdev_register_devices(struct serdev_controller *ctrl) @@ -552,6 +630,15 @@ static int acpi_serdev_register_devices(struct serdev_controller *ctrl)
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
dev_dbg(&ctrl->dev, "failed to enumerate serdev slaves\n"); dev_dbg(&ctrl->dev, "failed to enumerate serdev slaves\n");

21
patches/4.19/0002-suspend.patch
View file

@ -1,4 +1,4 @@
From ae134bb7065d18be2c462e46e00b7fbbac22f98b Mon Sep 17 00:00:00 2001 From c9eb0882c82e26571e96f3f010b555b66d9c3dc7 Mon Sep 17 00:00:00 2001
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com> From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
Date: Wed, 31 Jul 2019 08:39:18 +0900 Date: Wed, 31 Jul 2019 08:39:18 +0900
Subject: [PATCH 02/12] suspend Subject: [PATCH 02/12] suspend
@ -6,7 +6,6 @@ Subject: [PATCH 02/12] suspend
Note: Note:
NVMe part will be merged into Linux 5.3. Remove the part in this NVMe part will be merged into Linux 5.3. Remove the part in this
patch when it arrives. patch when it arrives.
--- ---
drivers/nvme/host/core.c | 36 +++++++++++++-- drivers/nvme/host/core.c | 36 +++++++++++++--
drivers/nvme/host/nvme.h | 7 +++ drivers/nvme/host/nvme.h | 7 +++
@ -16,7 +15,7 @@ patch when it arrives.
5 files changed, 153 insertions(+), 6 deletions(-) 5 files changed, 153 insertions(+), 6 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index e26d1191c..6d7be7d34 100644 index ae0b01059fc6..d3bcfead964e 100644
--- a/drivers/nvme/host/core.c --- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c
@@ -1028,15 +1028,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl, @@ -1028,15 +1028,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
@ -63,7 +62,7 @@ index e26d1191c..6d7be7d34 100644
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count) int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)
{ {
u32 q_count = (*count - 1) | ((*count - 1) << 16); u32 q_count = (*count - 1) | ((*count - 1) << 16);
@@ -3556,6 +3574,18 @@ static void nvme_free_ctrl(struct device *dev) @@ -3562,6 +3580,18 @@ static void nvme_free_ctrl(struct device *dev)
nvme_put_subsystem(subsys); nvme_put_subsystem(subsys);
} }
@ -83,7 +82,7 @@ index e26d1191c..6d7be7d34 100644
* Initialize a NVMe controller structures. This needs to be called during * Initialize a NVMe controller structures. This needs to be called during
* earliest initialization so that we have the initialized structured around * earliest initialization so that we have the initialized structured around
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index e82cdaec8..400ce4c01 100644 index 2653e1f4196d..3bcd14a28e32 100644
--- a/drivers/nvme/host/nvme.h --- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h
@@ -433,6 +433,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status, @@ -433,6 +433,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
@ -108,7 +107,7 @@ index e82cdaec8..400ce4c01 100644
void nvme_stop_keep_alive(struct nvme_ctrl *ctrl); void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
int nvme_reset_ctrl(struct nvme_ctrl *ctrl); int nvme_reset_ctrl(struct nvme_ctrl *ctrl);
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 0a5d064f8..e99c2f168 100644 index a64a8bca0d5b..5fca9fc04a3f 100644
--- a/drivers/nvme/host/pci.c --- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
@ -135,7 +134,7 @@ index 0a5d064f8..e99c2f168 100644
mutex_lock(&dev->shutdown_lock); mutex_lock(&dev->shutdown_lock);
result = nvme_pci_enable(dev); result = nvme_pci_enable(dev);
@@ -2605,16 +2608,94 @@ static void nvme_remove(struct pci_dev *pdev) @@ -2606,16 +2609,94 @@ static void nvme_remove(struct pci_dev *pdev)
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
@ -231,7 +230,7 @@ index 0a5d064f8..e99c2f168 100644
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct nvme_dev *ndev = pci_get_drvdata(pdev); struct nvme_dev *ndev = pci_get_drvdata(pdev);
@@ -2622,9 +2703,16 @@ static int nvme_resume(struct device *dev) @@ -2623,9 +2704,16 @@ static int nvme_resume(struct device *dev)
nvme_reset_ctrl(&ndev->ctrl); nvme_reset_ctrl(&ndev->ctrl);
return 0; return 0;
} }
@ -250,7 +249,7 @@ index 0a5d064f8..e99c2f168 100644
static pci_ers_result_t nvme_error_detected(struct pci_dev *pdev, static pci_ers_result_t nvme_error_detected(struct pci_dev *pdev,
pci_channel_state_t state) pci_channel_state_t state)
@@ -2727,9 +2815,11 @@ static struct pci_driver nvme_driver = { @@ -2728,9 +2816,11 @@ static struct pci_driver nvme_driver = {
.probe = nvme_probe, .probe = nvme_probe,
.remove = nvme_remove, .remove = nvme_remove,
.shutdown = nvme_shutdown, .shutdown = nvme_shutdown,
@ -263,7 +262,7 @@ index 0a5d064f8..e99c2f168 100644
.err_handler = &nvme_err_handler, .err_handler = &nvme_err_handler,
}; };
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 0bd595a0b..a8385e889 100644 index 0bd595a0b610..a8385e8894a5 100644
--- a/kernel/power/suspend.c --- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c +++ b/kernel/power/suspend.c
@@ -526,6 +526,8 @@ int suspend_devices_and_enter(suspend_state_t state) @@ -526,6 +526,8 @@ int suspend_devices_and_enter(suspend_state_t state)
@ -292,7 +291,7 @@ index 0bd595a0b..a8385e889 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 f8576509c..a5fa80e72 100644 index f8576509c7be..a5fa80e72aba 100644
--- a/kernel/sysctl.c --- a/kernel/sysctl.c
+++ b/kernel/sysctl.c +++ b/kernel/sysctl.c
@@ -313,7 +313,16 @@ static int min_extfrag_threshold; @@ -313,7 +313,16 @@ static int min_extfrag_threshold;

2
patches/4.19/0003-buttons.patch
View file

@ -1,4 +1,4 @@
From 0aafad89af1091dd4a919d2c5caff7f0188b2f99 Mon Sep 17 00:00:00 2001 From 55d520718530c27a92b8ccd347944a819a35573d Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:42:15 +0200 Date: Fri, 26 Jul 2019 03:42:15 +0200
Subject: [PATCH 03/12] buttons Subject: [PATCH 03/12] buttons

2
patches/4.19/0004-cameras.patch
View file

@ -1,4 +1,4 @@
From 9e96184aa9f22bcfe4dc193c986ce483910a52ce Mon Sep 17 00:00:00 2001 From c54f6acd2d773d40cc4661626cf46600236d664e Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:42:25 +0200 Date: Fri, 26 Jul 2019 03:42:25 +0200
Subject: [PATCH 04/12] cameras Subject: [PATCH 04/12] cameras

88
patches/4.19/0005-ipts.patch
View file

@ -1,4 +1,4 @@
From 903df87282438297ec3e5d244aa31854c2ce7c7b Mon Sep 17 00:00:00 2001 From d8171f6c5a5cdaad6171eda7bed33ebcd33c0323 Mon Sep 17 00:00:00 2001
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com> From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
Date: Tue, 10 Sep 2019 21:52:46 +0900 Date: Tue, 10 Sep 2019 21:52:46 +0900
Subject: [PATCH 05/12] ipts Subject: [PATCH 05/12] ipts
@ -71,7 +71,7 @@ Subject: [PATCH 05/12] ipts
create mode 100644 include/linux/intel_ipts_if.h create mode 100644 include/linux/intel_ipts_if.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 5794f102f..6ae0e91a2 100644 index 5794f102f9b8..6ae0e91a213a 100644
--- a/drivers/gpu/drm/i915/Makefile --- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile
@@ -155,6 +155,9 @@ i915-y += dvo_ch7017.o \ @@ -155,6 +155,9 @@ i915-y += dvo_ch7017.o \
@ -85,7 +85,7 @@ index 5794f102f..6ae0e91a2 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_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index f9ce35da4..c8b88b1b7 100644 index f9ce35da4123..c8b88b1b7bd4 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c --- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
@ -173,7 +173,7 @@ index f9ce35da4..c8b88b1b7 100644
int i915_debugfs_register(struct drm_i915_private *dev_priv) int i915_debugfs_register(struct drm_i915_private *dev_priv)
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 f8cfd16be..f48122746 100644 index a4b4ab7b9f8e..19a1d35c2315 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 @@
@ -194,7 +194,7 @@ index f8cfd16be..f48122746 100644
return 0; return 0;
cleanup_gem: cleanup_gem:
@@ -1432,6 +1436,9 @@ void i915_driver_unload(struct drm_device *dev) @@ -1438,6 +1442,9 @@ void i915_driver_unload(struct drm_device *dev)
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
struct pci_dev *pdev = dev_priv->drm.pdev; struct pci_dev *pdev = dev_priv->drm.pdev;
@ -205,7 +205,7 @@ index f8cfd16be..f48122746 100644
if (i915_gem_suspend(dev_priv)) if (i915_gem_suspend(dev_priv))
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 d6c25bea4..d6b507fb7 100644 index d6c25bea4382..d6b507fb7626 100644
--- a/drivers/gpu/drm/i915/i915_drv.h --- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3213,6 +3213,9 @@ void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj, @@ -3213,6 +3213,9 @@ void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
@ -219,7 +219,7 @@ index d6c25bea4..d6b507fb7 100644
__i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id) __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id)
{ {
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index b10770cfc..0222f0a55 100644 index b10770cfccd2..0222f0a55262 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c --- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -467,6 +467,18 @@ static bool needs_preempt_context(struct drm_i915_private *i915) @@ -467,6 +467,18 @@ static bool needs_preempt_context(struct drm_i915_private *i915)
@ -242,7 +242,7 @@ index b10770cfc..0222f0a55 100644
{ {
struct i915_gem_context *ctx; struct i915_gem_context *ctx;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 298779693..f98fdb5fc 100644 index 29877969310d..f98fdb5fc282 100644
--- a/drivers/gpu/drm/i915/i915_irq.c --- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
@ -274,7 +274,7 @@ index 298779693..f98fdb5fc 100644
GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT | GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT |
GT_CONTEXT_SWITCH_INTERRUPT << GEN8_BCS_IRQ_SHIFT, GT_CONTEXT_SWITCH_INTERRUPT << GEN8_BCS_IRQ_SHIFT,
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 295e981e4..84415814c 100644 index 295e981e4a39..84415814c007 100644
--- a/drivers/gpu/drm/i915/i915_params.c --- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c
@@ -145,7 +145,10 @@ i915_param_named_unsafe(edp_vswing, int, 0400, @@ -145,7 +145,10 @@ i915_param_named_unsafe(edp_vswing, int, 0400,
@ -290,7 +290,7 @@ index 295e981e4..84415814c 100644
i915_param_named(guc_log_level, int, 0400, i915_param_named(guc_log_level, int, 0400,
"GuC firmware logging level. Requires GuC to be loaded. " "GuC firmware logging level. Requires GuC to be loaded. "
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 6c4d4a214..4ab800c3d 100644 index 6c4d4a21474b..4ab800c3de6d 100644
--- a/drivers/gpu/drm/i915/i915_params.h --- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h
@@ -46,7 +46,7 @@ struct drm_printer; @@ -46,7 +46,7 @@ struct drm_printer;
@ -313,7 +313,7 @@ index 6c4d4a214..4ab800c3d 100644
#define MEMBER(T, member, ...) T member; #define MEMBER(T, member, ...) T member;
struct i915_params { struct i915_params {
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index f92079e19..7c2d78044 100644 index f92079e19de8..7c2d78044035 100644
--- a/drivers/gpu/drm/i915/intel_dp.c --- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2634,8 +2634,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode) @@ -2634,8 +2634,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode)
@ -328,7 +328,7 @@ index f92079e19..7c2d78044 100644
ret = drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER, ret = drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER,
DP_SET_POWER_D3); DP_SET_POWER_D3);
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 4121928a4..8967376ac 100644 index 4121928a495e..8967376accf3 100644
--- a/drivers/gpu/drm/i915/intel_guc.h --- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -69,6 +69,7 @@ struct intel_guc { @@ -69,6 +69,7 @@ struct intel_guc {
@ -340,7 +340,7 @@ index 4121928a4..8967376ac 100644
struct guc_preempt_work preempt_work[I915_NUM_ENGINES]; struct guc_preempt_work preempt_work[I915_NUM_ENGINES];
struct workqueue_struct *preempt_wq; struct workqueue_struct *preempt_wq;
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
index 4aa5e6463..f60c42390 100644 index 4aa5e6463e7b..f60c42390006 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c --- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -88,12 +88,17 @@ static inline struct i915_priolist *to_priolist(struct rb_node *rb) @@ -88,12 +88,17 @@ static inline struct i915_priolist *to_priolist(struct rb_node *rb)
@ -473,7 +473,7 @@ index 4aa5e6463..f60c42390 100644
#include "selftests/intel_guc.c" #include "selftests/intel_guc.c"
#endif #endif
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.h b/drivers/gpu/drm/i915/intel_guc_submission.h diff --git a/drivers/gpu/drm/i915/intel_guc_submission.h b/drivers/gpu/drm/i915/intel_guc_submission.h
index fb081cefe..71fc79865 100644 index fb081cefef93..71fc7986585a 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.h --- a/drivers/gpu/drm/i915/intel_guc_submission.h
+++ b/drivers/gpu/drm/i915/intel_guc_submission.h +++ b/drivers/gpu/drm/i915/intel_guc_submission.h
@@ -79,5 +79,9 @@ void intel_guc_submission_disable(struct intel_guc *guc); @@ -79,5 +79,9 @@ void intel_guc_submission_disable(struct intel_guc *guc);
@ -488,7 +488,7 @@ index fb081cefe..71fc79865 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 000000000..8ad1d22df index 000000000000..8ad1d22df5cd
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/i915/intel_ipts.c +++ b/drivers/gpu/drm/i915/intel_ipts.c
@@ -0,0 +1,651 @@ @@ -0,0 +1,651 @@
@ -1145,7 +1145,7 @@ index 000000000..8ad1d22df
+} +}
diff --git a/drivers/gpu/drm/i915/intel_ipts.h b/drivers/gpu/drm/i915/intel_ipts.h diff --git a/drivers/gpu/drm/i915/intel_ipts.h b/drivers/gpu/drm/i915/intel_ipts.h
new file mode 100644 new file mode 100644
index 000000000..a6965d102 index 000000000000..a6965d102417
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/i915/intel_ipts.h +++ b/drivers/gpu/drm/i915/intel_ipts.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
@ -1184,7 +1184,7 @@ index 000000000..a6965d102
+ +
+#endif //_INTEL_IPTS_H_ +#endif //_INTEL_IPTS_H_
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 6937ef0b4..f669087d6 100644 index 6937ef0b4bfc..f669087d6419 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c --- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -164,9 +164,6 @@ @@ -164,9 +164,6 @@
@ -1235,7 +1235,7 @@ index 6937ef0b4..f669087d6 100644
struct intel_context *ce) struct intel_context *ce)
{ {
diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h
index 4dfb78e3e..32159231a 100644 index 4dfb78e3ec7e..32159231a16e 100644
--- a/drivers/gpu/drm/i915/intel_lrc.h --- a/drivers/gpu/drm/i915/intel_lrc.h
+++ b/drivers/gpu/drm/i915/intel_lrc.h +++ b/drivers/gpu/drm/i915/intel_lrc.h
@@ -106,4 +106,12 @@ void intel_lr_context_resume(struct drm_i915_private *dev_priv); @@ -106,4 +106,12 @@ void intel_lr_context_resume(struct drm_i915_private *dev_priv);
@ -1252,7 +1252,7 @@ index 4dfb78e3e..32159231a 100644
+ +
#endif /* _INTEL_LRC_H_ */ #endif /* _INTEL_LRC_H_ */
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 4a9f139e7..a800b93cf 100644 index 4a9f139e7b73..a800b93cf33d 100644
--- a/drivers/gpu/drm/i915/intel_panel.c --- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
@ -1284,7 +1284,7 @@ index 4a9f139e7..a800b93cf 100644
static void pch_enable_backlight(const struct intel_crtc_state *crtc_state, static void pch_enable_backlight(const struct intel_crtc_state *crtc_state,
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index f9167d0e0..28b729c9d 100644 index f9167d0e095c..28b729c9d804 100644
--- a/drivers/hid/hid-multitouch.c --- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c
@@ -173,6 +173,7 @@ struct mt_device { @@ -173,6 +173,7 @@ struct mt_device {
@ -1360,7 +1360,7 @@ index f9167d0e0..28b729c9d 100644
INIT_LIST_HEAD(&td->applications); INIT_LIST_HEAD(&td->applications);
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 3726eacdf..77263b5f5 100644 index 3726eacdf65d..77263b5f5915 100644
--- a/drivers/misc/Kconfig --- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig
@@ -520,6 +520,7 @@ source "drivers/misc/ti-st/Kconfig" @@ -520,6 +520,7 @@ source "drivers/misc/ti-st/Kconfig"
@ -1372,7 +1372,7 @@ index 3726eacdf..77263b5f5 100644
source "drivers/misc/mic/Kconfig" source "drivers/misc/mic/Kconfig"
source "drivers/misc/genwqe/Kconfig" source "drivers/misc/genwqe/Kconfig"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index af22bbc3d..eb1eb0d58 100644 index af22bbc3d00c..eb1eb0d58c32 100644
--- a/drivers/misc/Makefile --- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile +++ b/drivers/misc/Makefile
@@ -44,6 +44,7 @@ obj-y += lis3lv02d/ @@ -44,6 +44,7 @@ obj-y += lis3lv02d/
@ -1385,7 +1385,7 @@ index af22bbc3d..eb1eb0d58 100644
obj-$(CONFIG_SRAM) += sram.o obj-$(CONFIG_SRAM) += sram.o
diff --git a/drivers/misc/ipts/Kconfig b/drivers/misc/ipts/Kconfig diff --git a/drivers/misc/ipts/Kconfig b/drivers/misc/ipts/Kconfig
new file mode 100644 new file mode 100644
index 000000000..360ed3861 index 000000000000..360ed3861b82
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/Kconfig +++ b/drivers/misc/ipts/Kconfig
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
@ -1400,7 +1400,7 @@ index 000000000..360ed3861
+ Intel Kabylake + Intel Kabylake
diff --git a/drivers/misc/ipts/Makefile b/drivers/misc/ipts/Makefile diff --git a/drivers/misc/ipts/Makefile b/drivers/misc/ipts/Makefile
new file mode 100644 new file mode 100644
index 000000000..1783e9cf1 index 000000000000..1783e9cf13c9
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/Makefile +++ b/drivers/misc/ipts/Makefile
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
@ -1419,7 +1419,7 @@ index 000000000..1783e9cf1
+intel-ipts-$(CONFIG_DEBUG_FS) += ipts-dbgfs.o +intel-ipts-$(CONFIG_DEBUG_FS) += ipts-dbgfs.o
diff --git a/drivers/misc/ipts/ipts-binary-spec.h b/drivers/misc/ipts/ipts-binary-spec.h diff --git a/drivers/misc/ipts/ipts-binary-spec.h b/drivers/misc/ipts/ipts-binary-spec.h
new file mode 100644 new file mode 100644
index 000000000..87d4bc413 index 000000000000..87d4bc4133c4
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-binary-spec.h +++ b/drivers/misc/ipts/ipts-binary-spec.h
@@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
@ -1543,7 +1543,7 @@ index 000000000..87d4bc413
+#endif /* _IPTS_BINARY_SPEC_H */ +#endif /* _IPTS_BINARY_SPEC_H */
diff --git a/drivers/misc/ipts/ipts-dbgfs.c b/drivers/misc/ipts/ipts-dbgfs.c diff --git a/drivers/misc/ipts/ipts-dbgfs.c b/drivers/misc/ipts/ipts-dbgfs.c
new file mode 100644 new file mode 100644
index 000000000..7581b21f8 index 000000000000..7581b21f81e0
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-dbgfs.c +++ b/drivers/misc/ipts/ipts-dbgfs.c
@@ -0,0 +1,364 @@ @@ -0,0 +1,364 @@
@ -1913,7 +1913,7 @@ index 000000000..7581b21f8
+} +}
diff --git a/drivers/misc/ipts/ipts-gfx.c b/drivers/misc/ipts/ipts-gfx.c diff --git a/drivers/misc/ipts/ipts-gfx.c b/drivers/misc/ipts/ipts-gfx.c
new file mode 100644 new file mode 100644
index 000000000..4989a2222 index 000000000000..4989a22227d2
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-gfx.c +++ b/drivers/misc/ipts/ipts-gfx.c
@@ -0,0 +1,185 @@ @@ -0,0 +1,185 @@
@ -2104,7 +2104,7 @@ index 000000000..4989a2222
+} +}
diff --git a/drivers/misc/ipts/ipts-gfx.h b/drivers/misc/ipts/ipts-gfx.h diff --git a/drivers/misc/ipts/ipts-gfx.h b/drivers/misc/ipts/ipts-gfx.h
new file mode 100644 new file mode 100644
index 000000000..03a5f3551 index 000000000000..03a5f3551ddf
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-gfx.h +++ b/drivers/misc/ipts/ipts-gfx.h
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
@ -2134,7 +2134,7 @@ index 000000000..03a5f3551
+#endif // _IPTS_GFX_H_ +#endif // _IPTS_GFX_H_
diff --git a/drivers/misc/ipts/ipts-hid.c b/drivers/misc/ipts/ipts-hid.c diff --git a/drivers/misc/ipts/ipts-hid.c b/drivers/misc/ipts/ipts-hid.c
new file mode 100644 new file mode 100644
index 000000000..84e3fb6c3 index 000000000000..84e3fb6c34be
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-hid.c +++ b/drivers/misc/ipts/ipts-hid.c
@@ -0,0 +1,504 @@ @@ -0,0 +1,504 @@
@ -2644,7 +2644,7 @@ index 000000000..84e3fb6c3
+} +}
diff --git a/drivers/misc/ipts/ipts-hid.h b/drivers/misc/ipts/ipts-hid.h diff --git a/drivers/misc/ipts/ipts-hid.h b/drivers/misc/ipts/ipts-hid.h
new file mode 100644 new file mode 100644
index 000000000..f1b22c912 index 000000000000..f1b22c912df7
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-hid.h +++ b/drivers/misc/ipts/ipts-hid.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
@ -2684,7 +2684,7 @@ index 000000000..f1b22c912
+#endif /* _IPTS_HID_H_ */ +#endif /* _IPTS_HID_H_ */
diff --git a/drivers/misc/ipts/ipts-kernel.c b/drivers/misc/ipts/ipts-kernel.c diff --git a/drivers/misc/ipts/ipts-kernel.c b/drivers/misc/ipts/ipts-kernel.c
new file mode 100644 new file mode 100644
index 000000000..86fd359d2 index 000000000000..86fd359d2eed
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-kernel.c +++ b/drivers/misc/ipts/ipts-kernel.c
@@ -0,0 +1,1050 @@ @@ -0,0 +1,1050 @@
@ -3740,7 +3740,7 @@ index 000000000..86fd359d2
+} +}
diff --git a/drivers/misc/ipts/ipts-kernel.h b/drivers/misc/ipts/ipts-kernel.h diff --git a/drivers/misc/ipts/ipts-kernel.h b/drivers/misc/ipts/ipts-kernel.h
new file mode 100644 new file mode 100644
index 000000000..0e7f1393b index 000000000000..0e7f1393b807
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-kernel.h +++ b/drivers/misc/ipts/ipts-kernel.h
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
@ -3769,7 +3769,7 @@ index 000000000..0e7f1393b
+#endif +#endif
diff --git a/drivers/misc/ipts/ipts-mei-msgs.h b/drivers/misc/ipts/ipts-mei-msgs.h diff --git a/drivers/misc/ipts/ipts-mei-msgs.h b/drivers/misc/ipts/ipts-mei-msgs.h
new file mode 100644 new file mode 100644
index 000000000..8ca146800 index 000000000000..8ca146800a47
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-mei-msgs.h +++ b/drivers/misc/ipts/ipts-mei-msgs.h
@@ -0,0 +1,585 @@ @@ -0,0 +1,585 @@
@ -4360,7 +4360,7 @@ index 000000000..8ca146800
+#endif // _IPTS_MEI_MSGS_H_ +#endif // _IPTS_MEI_MSGS_H_
diff --git a/drivers/misc/ipts/ipts-mei.c b/drivers/misc/ipts/ipts-mei.c diff --git a/drivers/misc/ipts/ipts-mei.c b/drivers/misc/ipts/ipts-mei.c
new file mode 100644 new file mode 100644
index 000000000..199e49cb8 index 000000000000..199e49cb8d70
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-mei.c +++ b/drivers/misc/ipts/ipts-mei.c
@@ -0,0 +1,282 @@ @@ -0,0 +1,282 @@
@ -4648,7 +4648,7 @@ index 000000000..199e49cb8
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff --git a/drivers/misc/ipts/ipts-msg-handler.c b/drivers/misc/ipts/ipts-msg-handler.c diff --git a/drivers/misc/ipts/ipts-msg-handler.c b/drivers/misc/ipts/ipts-msg-handler.c
new file mode 100644 new file mode 100644
index 000000000..db5356a1c index 000000000000..db5356a1c84e
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-msg-handler.c +++ b/drivers/misc/ipts/ipts-msg-handler.c
@@ -0,0 +1,437 @@ @@ -0,0 +1,437 @@
@ -5091,7 +5091,7 @@ index 000000000..db5356a1c
+} +}
diff --git a/drivers/misc/ipts/ipts-msg-handler.h b/drivers/misc/ipts/ipts-msg-handler.h diff --git a/drivers/misc/ipts/ipts-msg-handler.h b/drivers/misc/ipts/ipts-msg-handler.h
new file mode 100644 new file mode 100644
index 000000000..f37d9ad9a index 000000000000..f37d9ad9af8c
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-msg-handler.h +++ b/drivers/misc/ipts/ipts-msg-handler.h
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
@ -5130,7 +5130,7 @@ index 000000000..f37d9ad9a
+#endif /* _IPTS_MSG_HANDLER_H */ +#endif /* _IPTS_MSG_HANDLER_H */
diff --git a/drivers/misc/ipts/ipts-resource.c b/drivers/misc/ipts/ipts-resource.c diff --git a/drivers/misc/ipts/ipts-resource.c b/drivers/misc/ipts/ipts-resource.c
new file mode 100644 new file mode 100644
index 000000000..47607ef7c index 000000000000..47607ef7c461
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-resource.c +++ b/drivers/misc/ipts/ipts-resource.c
@@ -0,0 +1,277 @@ @@ -0,0 +1,277 @@
@ -5413,7 +5413,7 @@ index 000000000..47607ef7c
+} +}
diff --git a/drivers/misc/ipts/ipts-resource.h b/drivers/misc/ipts/ipts-resource.h diff --git a/drivers/misc/ipts/ipts-resource.h b/drivers/misc/ipts/ipts-resource.h
new file mode 100644 new file mode 100644
index 000000000..7d66ac72b index 000000000000..7d66ac72b475
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-resource.h +++ b/drivers/misc/ipts/ipts-resource.h
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
@ -5449,7 +5449,7 @@ index 000000000..7d66ac72b
+#endif // _IPTS_RESOURCE_H_ +#endif // _IPTS_RESOURCE_H_
diff --git a/drivers/misc/ipts/ipts-sensor-regs.h b/drivers/misc/ipts/ipts-sensor-regs.h diff --git a/drivers/misc/ipts/ipts-sensor-regs.h b/drivers/misc/ipts/ipts-sensor-regs.h
new file mode 100644 new file mode 100644
index 000000000..96812b0eb index 000000000000..96812b0eb980
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-sensor-regs.h +++ b/drivers/misc/ipts/ipts-sensor-regs.h
@@ -0,0 +1,700 @@ @@ -0,0 +1,700 @@
@ -6155,7 +6155,7 @@ index 000000000..96812b0eb
+#endif // _TOUCH_SENSOR_REGS_H +#endif // _TOUCH_SENSOR_REGS_H
diff --git a/drivers/misc/ipts/ipts-state.h b/drivers/misc/ipts/ipts-state.h diff --git a/drivers/misc/ipts/ipts-state.h b/drivers/misc/ipts/ipts-state.h
new file mode 100644 new file mode 100644
index 000000000..39a2eaf5f index 000000000000..39a2eaf5f004
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-state.h +++ b/drivers/misc/ipts/ipts-state.h
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
@ -6190,7 +6190,7 @@ index 000000000..39a2eaf5f
+#endif // _IPTS_STATE_H_ +#endif // _IPTS_STATE_H_
diff --git a/drivers/misc/ipts/ipts.h b/drivers/misc/ipts/ipts.h diff --git a/drivers/misc/ipts/ipts.h b/drivers/misc/ipts/ipts.h
new file mode 100644 new file mode 100644
index 000000000..9c34b55ff index 000000000000..9c34b55ff036
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts.h +++ b/drivers/misc/ipts/ipts.h
@@ -0,0 +1,200 @@ @@ -0,0 +1,200 @@
@ -6395,7 +6395,7 @@ index 000000000..9c34b55ff
+ +
+#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 225373e4a..828342db0 100644 index cdd7af16d5ee..c1bd39324c98 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 @@
@ -6407,7 +6407,7 @@ index 225373e4a..828342db0 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 a66ebceea..030e8f429 100644 index e41f9e0a3fdf..e61be367d7e4 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[] = {
@ -6420,7 +6420,7 @@ index a66ebceea..030e8f429 100644
{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_CFG)},
diff --git a/include/linux/intel_ipts_if.h b/include/linux/intel_ipts_if.h diff --git a/include/linux/intel_ipts_if.h b/include/linux/intel_ipts_if.h
new file mode 100644 new file mode 100644
index 000000000..bad44fb4f index 000000000000..bad44fb4f233
--- /dev/null --- /dev/null
+++ b/include/linux/intel_ipts_if.h +++ b/include/linux/intel_ipts_if.h
@@ -0,0 +1,76 @@ @@ -0,0 +1,76 @@

6
patches/4.19/0006-hid.patch
View file

@ -1,4 +1,4 @@
From f31d20b0da3d3420b907df811b1f86098bf90377 Mon Sep 17 00:00:00 2001 From ca73cbce514e2cd502e31ec6fad9e1b25944adea Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:42:50 +0200 Date: Fri, 26 Jul 2019 03:42:50 +0200
Subject: [PATCH 06/12] hid Subject: [PATCH 06/12] hid
@ -11,7 +11,7 @@ Subject: [PATCH 06/12] hid
4 files changed, 86 insertions(+), 6 deletions(-) 4 files changed, 86 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 2898bb061945..13bb280c4dc7 100644 index 4a2fa57ddcb8..f27c3d6eacd5 100644
--- a/drivers/hid/hid-ids.h --- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h
@@ -804,11 +804,22 @@ @@ -804,11 +804,22 @@
@ -125,7 +125,7 @@ index 28b729c9d804..334afd3854a9 100644
{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE, { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
MT_USB_DEVICE(USB_VENDOR_ID_ASUS, MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index d29c7c9cd185..351abb6cb197 100644 index e553f6fae7a4..aeb925d340bd 100644
--- a/drivers/hid/hid-quirks.c --- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c
@@ -114,6 +114,17 @@ static const struct hid_device_id hid_quirks[] = { @@ -114,6 +114,17 @@ static const struct hid_device_id hid_quirks[] = {

2
patches/4.19/0007-sdcard-reader.patch
View file

@ -1,4 +1,4 @@
From d6508cabcf5266f488adfecc2f03cb37b7849aa1 Mon Sep 17 00:00:00 2001 From 100972e56970a25b066cc645b53804973533b078 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:03 +0200 Date: Fri, 26 Jul 2019 03:43:03 +0200
Subject: [PATCH 07/12] sdcard-reader Subject: [PATCH 07/12] sdcard-reader

2
patches/4.19/0008-wifi.patch
View file

@ -1,4 +1,4 @@
From 5fdb2f335eedc98a627807162709d71b46df0c90 Mon Sep 17 00:00:00 2001 From b28a98e8f7dd0f722b489994c698f9cce67f1c3f Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:14 +0200 Date: Fri, 26 Jul 2019 03:43:14 +0200
Subject: [PATCH 08/12] wifi Subject: [PATCH 08/12] wifi

2
patches/4.19/0009-surface3-power.patch
View file

@ -1,4 +1,4 @@
From fd8e6225feee5a76333bafde5fd007c59a40867f Mon Sep 17 00:00:00 2001 From c0b0a5889cd97946e8e8f91f03620e69c7adf812 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:27 +0200 Date: Fri, 26 Jul 2019 03:43:27 +0200
Subject: [PATCH 09/12] surface3-power Subject: [PATCH 09/12] surface3-power

2
patches/4.19/0010-mwlwifi.patch
View file

@ -1,4 +1,4 @@
From 5122e280ac379121c8b9eba81d6d5a91f2c8c981 Mon Sep 17 00:00:00 2001 From f5710257f7bc180b95e79ad5577d6f1dca0399f7 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:45 +0200 Date: Fri, 26 Jul 2019 03:43:45 +0200
Subject: [PATCH 10/12] mwlwifi Subject: [PATCH 10/12] mwlwifi

2
patches/4.19/0011-surface-lte.patch
View file

@ -1,4 +1,4 @@
From 09b4ad8e1ab07dab21a341c200049bb45649e663 Mon Sep 17 00:00:00 2001 From ca60cf39c24994a633314b5c243b02cc2e415e9d Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:43:57 +0200 Date: Fri, 26 Jul 2019 03:43:57 +0200
Subject: [PATCH 11/12] surface-lte Subject: [PATCH 11/12] surface-lte

2
patches/4.19/0012-surfacebook2-dgpu.patch
View file

@ -1,4 +1,4 @@
From 154df84d55d3aa7af762836ece1ed59866673744 Mon Sep 17 00:00:00 2001 From 18e4ba6b37b44e0756a74ef32b9ba57b85ec3f8c Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 03:44:10 +0200 Date: Fri, 26 Jul 2019 03:44:10 +0200
Subject: [PATCH 12/12] surfacebook2-dgpu Subject: [PATCH 12/12] surfacebook2-dgpu

26
patches/5.2/0001-surface-acpi.patch
View file

@ -1,4 +1,4 @@
From 9b98d8261c388ab7b8b890f621f1987d6412d774 Mon Sep 17 00:00:00 2001 From d4d386abdc4817e58e10db9971ee6af3e6da2e07 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:44:14 +0200 Date: Fri, 26 Jul 2019 04:44:14 +0200
Subject: [PATCH 01/12] surface-acpi Subject: [PATCH 01/12] surface-acpi
@ -9,8 +9,8 @@ Subject: [PATCH 01/12] surface-acpi
drivers/platform/x86/Kconfig | 97 + drivers/platform/x86/Kconfig | 97 +
drivers/platform/x86/Makefile | 1 + drivers/platform/x86/Makefile | 1 +
drivers/platform/x86/surface_acpi.c | 3913 +++++++++++++++++++++++++++ drivers/platform/x86/surface_acpi.c | 3913 +++++++++++++++++++++++++++
drivers/tty/serdev/core.c | 90 +- drivers/tty/serdev/core.c | 87 +
6 files changed, 4109 insertions(+), 6 deletions(-) 6 files changed, 4108 insertions(+), 4 deletions(-)
create mode 100644 drivers/platform/x86/surface_acpi.c create mode 100644 drivers/platform/x86/surface_acpi.c
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
@ -59,7 +59,7 @@ index d3d2dbfba680..0b7f617a6e9b 100644
buffer_desc = acpi_ut_create_buffer_object(buffer_length); buffer_desc = acpi_ut_create_buffer_object(buffer_length);
if (!buffer_desc) { if (!buffer_desc) {
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 5d5cc6111081..4fefae580dec 100644 index 7c2fd1d72e18..c00cb830914a 100644
--- a/drivers/platform/x86/Kconfig --- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig
@@ -623,6 +623,103 @@ config THINKPAD_ACPI_HOTKEY_POLL @@ -623,6 +623,103 @@ config THINKPAD_ACPI_HOTKEY_POLL
@ -4098,20 +4098,10 @@ index 000000000000..f62aecb0df69
+MODULE_DESCRIPTION("ACPI/Platform Drivers for Microsoft Surface Devices"); +MODULE_DESCRIPTION("ACPI/Platform Drivers for Microsoft Surface Devices");
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c
index a0ac16ee6575..0dd242ff24d1 100644 index a0ac16ee6575..e455322a7765 100644
--- a/drivers/tty/serdev/core.c --- a/drivers/tty/serdev/core.c
+++ b/drivers/tty/serdev/core.c +++ b/drivers/tty/serdev/core.c
@@ -558,8 +558,7 @@ static acpi_status acpi_serdev_register_device(struct serdev_controller *ctrl, @@ -582,6 +582,81 @@ static acpi_status acpi_serdev_register_device(struct serdev_controller *ctrl,
struct serdev_device *serdev = NULL;
int err;
- if (acpi_bus_get_status(adev) || !adev->status.present ||
- acpi_device_enumerated(adev))
+ if (acpi_bus_get_status(adev) || !adev->status.present)
return AE_OK;
serdev = serdev_device_alloc(ctrl);
@@ -582,6 +581,81 @@ static acpi_status acpi_serdev_register_device(struct serdev_controller *ctrl,
return AE_OK; return AE_OK;
} }
@ -4193,7 +4183,7 @@ index a0ac16ee6575..0dd242ff24d1 100644
static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level, static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level,
void *data, void **return_value) void *data, void **return_value)
{ {
@@ -591,6 +665,9 @@ static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level, @@ -591,6 +666,9 @@ static acpi_status acpi_serdev_add_device(acpi_handle handle, u32 level,
if (acpi_bus_get_device(handle, &adev)) if (acpi_bus_get_device(handle, &adev))
return AE_OK; return AE_OK;
@ -4203,7 +4193,7 @@ index a0ac16ee6575..0dd242ff24d1 100644
return acpi_serdev_register_device(ctrl, adev); return acpi_serdev_register_device(ctrl, adev);
} }
@@ -608,6 +685,15 @@ static int acpi_serdev_register_devices(struct serdev_controller *ctrl) @@ -608,6 +686,15 @@ static int acpi_serdev_register_devices(struct serdev_controller *ctrl)
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
dev_dbg(&ctrl->dev, "failed to enumerate serdev slaves\n"); dev_dbg(&ctrl->dev, "failed to enumerate serdev slaves\n");

25
patches/5.2/0002-suspend.patch
View file

@ -1,4 +1,4 @@
From 0aa6cc9a8970c8dae97563a1886dafc9ef79e011 Mon Sep 17 00:00:00 2001 From 3902051025f388147dea5c8ccec0d6b0a8b87bd2 Mon Sep 17 00:00:00 2001
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com> From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
Date: Wed, 31 Jul 2019 08:41:30 +0900 Date: Wed, 31 Jul 2019 08:41:30 +0900
Subject: [PATCH 02/12] suspend Subject: [PATCH 02/12] suspend
@ -6,7 +6,6 @@ Subject: [PATCH 02/12] suspend
Note: Note:
NVMe part will be merged into Linux 5.3. Remove the part in this NVMe part will be merged into Linux 5.3. Remove the part in this
patch when it arrives. patch when it arrives.
--- ---
drivers/nvme/host/core.c | 24 ++++++++-- drivers/nvme/host/core.c | 24 ++++++++--
drivers/nvme/host/nvme.h | 6 +++ drivers/nvme/host/nvme.h | 6 +++
@ -16,10 +15,10 @@ patch when it arrives.
5 files changed, 139 insertions(+), 6 deletions(-) 5 files changed, 139 insertions(+), 6 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 22c68e3b7..3b3960e0c 100644 index 963b4c6309b9..4b8cf243c150 100644
--- a/drivers/nvme/host/core.c --- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c
@@ -1113,15 +1113,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl, @@ -1114,15 +1114,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
return id; return id;
} }
@ -38,7 +37,7 @@ index 22c68e3b7..3b3960e0c 100644
c.features.fid = cpu_to_le32(fid); c.features.fid = cpu_to_le32(fid);
c.features.dword11 = cpu_to_le32(dword11); c.features.dword11 = cpu_to_le32(dword11);
@@ -1132,6 +1132,24 @@ static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword @@ -1133,6 +1133,24 @@ static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword
return ret; return ret;
} }
@ -64,7 +63,7 @@ index 22c68e3b7..3b3960e0c 100644
{ {
u32 q_count = (*count - 1) | ((*count - 1) << 16); u32 q_count = (*count - 1) | ((*count - 1) << 16);
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 55553d293..038b8931d 100644 index 81215ca32671..9285d5f6437b 100644
--- a/drivers/nvme/host/nvme.h --- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h
@@ -459,6 +459,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, @@ -459,6 +459,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
@ -81,7 +80,7 @@ index 55553d293..038b8931d 100644
void nvme_stop_keep_alive(struct nvme_ctrl *ctrl); void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
int nvme_reset_ctrl(struct nvme_ctrl *ctrl); int nvme_reset_ctrl(struct nvme_ctrl *ctrl);
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index f5bc1c30c..aea3b42a5 100644 index 09ffd21d1809..3e22d5f14e93 100644
--- a/drivers/nvme/host/pci.c --- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
@ -100,7 +99,7 @@ index f5bc1c30c..aea3b42a5 100644
mempool_t *iod_mempool; mempool_t *iod_mempool;
@@ -2843,16 +2845,94 @@ static void nvme_remove(struct pci_dev *pdev) @@ -2849,16 +2851,94 @@ static void nvme_remove(struct pci_dev *pdev)
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
@ -196,7 +195,7 @@ index f5bc1c30c..aea3b42a5 100644
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct nvme_dev *ndev = pci_get_drvdata(pdev); struct nvme_dev *ndev = pci_get_drvdata(pdev);
@@ -2860,9 +2940,16 @@ static int nvme_resume(struct device *dev) @@ -2866,9 +2946,16 @@ static int nvme_resume(struct device *dev)
nvme_reset_ctrl(&ndev->ctrl); nvme_reset_ctrl(&ndev->ctrl);
return 0; return 0;
} }
@ -215,7 +214,7 @@ index f5bc1c30c..aea3b42a5 100644
static pci_ers_result_t nvme_error_detected(struct pci_dev *pdev, static pci_ers_result_t nvme_error_detected(struct pci_dev *pdev,
pci_channel_state_t state) pci_channel_state_t state)
@@ -2967,9 +3054,11 @@ static struct pci_driver nvme_driver = { @@ -2975,9 +3062,11 @@ static struct pci_driver nvme_driver = {
.probe = nvme_probe, .probe = nvme_probe,
.remove = nvme_remove, .remove = nvme_remove,
.shutdown = nvme_shutdown, .shutdown = nvme_shutdown,
@ -228,7 +227,7 @@ index f5bc1c30c..aea3b42a5 100644
.err_handler = &nvme_err_handler, .err_handler = &nvme_err_handler,
}; };
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 096211299..0cb0fe170 100644 index 096211299c07..0cb0fe170977 100644
--- a/kernel/power/suspend.c --- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c +++ b/kernel/power/suspend.c
@@ -533,6 +533,8 @@ int suspend_devices_and_enter(suspend_state_t state) @@ -533,6 +533,8 @@ int suspend_devices_and_enter(suspend_state_t state)
@ -257,10 +256,10 @@ index 096211299..0cb0fe170 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 fb9633b8b..a203942f8 100644 index 1beca96fb625..4b98db9bbc88 100644
--- a/kernel/sysctl.c --- a/kernel/sysctl.c
+++ b/kernel/sysctl.c +++ b/kernel/sysctl.c
@@ -321,7 +321,16 @@ static int min_extfrag_threshold; @@ -318,7 +318,16 @@ static int min_extfrag_threshold;
static int max_extfrag_threshold = 1000; static int max_extfrag_threshold = 1000;
#endif #endif

2
patches/5.2/0003-buttons.patch
View file

@ -1,4 +1,4 @@
From 7e1cb9d4aab83fe74b0e45a3a5d4eb475fb34f73 Mon Sep 17 00:00:00 2001 From 28bc715183ef72470ec7a0d5df3b572814a18500 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:45:10 +0200 Date: Fri, 26 Jul 2019 04:45:10 +0200
Subject: [PATCH 03/12] buttons Subject: [PATCH 03/12] buttons

2
patches/5.2/0004-cameras.patch
View file

@ -1,4 +1,4 @@
From f8bcea016a8bb9b7c58a06a977dd838d265098b1 Mon Sep 17 00:00:00 2001 From 1af16ec5d87924e40ff153cc83dff212c3b80a7c Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:45:19 +0200 Date: Fri, 26 Jul 2019 04:45:19 +0200
Subject: [PATCH 04/12] cameras Subject: [PATCH 04/12] cameras

88
patches/5.2/0005-ipts.patch
View file

@ -1,4 +1,4 @@
From d5f7538c2e18ef6e3d6290db4c3372e1509b9150 Mon Sep 17 00:00:00 2001 From 36650ae8bf4456b65601e46b23a3e1595009934e Mon Sep 17 00:00:00 2001
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com> From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
Date: Tue, 10 Sep 2019 21:54:42 +0900 Date: Tue, 10 Sep 2019 21:54:42 +0900
Subject: [PATCH 05/12] ipts Subject: [PATCH 05/12] ipts
@ -71,7 +71,7 @@ Subject: [PATCH 05/12] ipts
create mode 100644 include/linux/intel_ipts_if.h create mode 100644 include/linux/intel_ipts_if.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index fbcb0904f..1a273956b 100644 index fbcb0904f4a8..1a273956b41c 100644
--- a/drivers/gpu/drm/i915/Makefile --- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile
@@ -170,6 +170,9 @@ i915-y += dvo_ch7017.o \ @@ -170,6 +170,9 @@ i915-y += dvo_ch7017.o \
@ -85,7 +85,7 @@ index fbcb0904f..1a273956b 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_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 5823ffb17..2ffad9712 100644 index 5823ffb17821..2ffad9712041 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c --- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
@ -173,7 +173,7 @@ index 5823ffb17..2ffad9712 100644
int i915_debugfs_register(struct drm_i915_private *dev_priv) int i915_debugfs_register(struct drm_i915_private *dev_priv)
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 1ad88e6d7..b50823fd3 100644 index d485d49c473b..adb7af18dc2b 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
@@ -63,6 +63,7 @@ @@ -63,6 +63,7 @@
@ -194,7 +194,7 @@ index 1ad88e6d7..b50823fd3 100644
return 0; return 0;
cleanup_gem: cleanup_gem:
@@ -1912,6 +1916,9 @@ void i915_driver_unload(struct drm_device *dev) @@ -1918,6 +1922,9 @@ void i915_driver_unload(struct drm_device *dev)
disable_rpm_wakeref_asserts(dev_priv); disable_rpm_wakeref_asserts(dev_priv);
@ -205,7 +205,7 @@ index 1ad88e6d7..b50823fd3 100644
/* /*
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 066fd2a12..2a872d872 100644 index 066fd2a12851..2a872d8725b5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h --- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3184,6 +3184,9 @@ void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj, @@ -3184,6 +3184,9 @@ void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
@ -219,7 +219,7 @@ index 066fd2a12..2a872d872 100644
__i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id) __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id)
{ {
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index dd728b26b..ae3209b79 100644 index dd728b26b5aa..ae3209b79b25 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c --- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -565,6 +565,18 @@ static bool needs_preempt_context(struct drm_i915_private *i915) @@ -565,6 +565,18 @@ static bool needs_preempt_context(struct drm_i915_private *i915)
@ -242,7 +242,7 @@ index dd728b26b..ae3209b79 100644
{ {
struct i915_gem_context *ctx; struct i915_gem_context *ctx;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index b92cfd691..78fcd4b78 100644 index b92cfd69134b..78fcd4b78480 100644
--- a/drivers/gpu/drm/i915/i915_irq.c --- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
@ -274,7 +274,7 @@ index b92cfd691..78fcd4b78 100644
GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT | GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT |
GT_CONTEXT_SWITCH_INTERRUPT << GEN8_BCS_IRQ_SHIFT), GT_CONTEXT_SWITCH_INTERRUPT << GEN8_BCS_IRQ_SHIFT),
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index b5be0abbb..831f2bcae 100644 index b5be0abbba35..831f2bcae687 100644
--- a/drivers/gpu/drm/i915/i915_params.c --- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c
@@ -143,7 +143,10 @@ i915_param_named_unsafe(edp_vswing, int, 0400, @@ -143,7 +143,10 @@ i915_param_named_unsafe(edp_vswing, int, 0400,
@ -290,7 +290,7 @@ index b5be0abbb..831f2bcae 100644
i915_param_named(guc_log_level, int, 0400, i915_param_named(guc_log_level, int, 0400,
"GuC firmware logging level. Requires GuC to be loaded. " "GuC firmware logging level. Requires GuC to be loaded. "
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 3f14e9881..e314a2414 100644 index 3f14e9881a0d..e314a2414041 100644
--- a/drivers/gpu/drm/i915/i915_params.h --- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h
@@ -54,7 +54,7 @@ struct drm_printer; @@ -54,7 +54,7 @@ struct drm_printer;
@ -313,7 +313,7 @@ index 3f14e9881..e314a2414 100644
#define MEMBER(T, member, ...) T member; #define MEMBER(T, member, ...) T member;
struct i915_params { struct i915_params {
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 560274d1c..e305a35de 100644 index 560274d1c50b..e305a35de9c2 100644
--- a/drivers/gpu/drm/i915/intel_dp.c --- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2899,8 +2899,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode) @@ -2899,8 +2899,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode)
@ -328,7 +328,7 @@ index 560274d1c..e305a35de 100644
ret = drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER, ret = drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER,
DP_SET_POWER_D3); DP_SET_POWER_D3);
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 2c59ff8d9..d7f916939 100644 index 2c59ff8d9f39..d7f91693972f 100644
--- a/drivers/gpu/drm/i915/intel_guc.h --- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -67,6 +67,7 @@ struct intel_guc { @@ -67,6 +67,7 @@ struct intel_guc {
@ -340,7 +340,7 @@ index 2c59ff8d9..d7f916939 100644
struct guc_preempt_work preempt_work[I915_NUM_ENGINES]; struct guc_preempt_work preempt_work[I915_NUM_ENGINES];
struct workqueue_struct *preempt_wq; struct workqueue_struct *preempt_wq;
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
index 46cd0e70a..e84c805f7 100644 index 46cd0e70aecb..e84c805f7340 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c --- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -93,12 +93,17 @@ static inline struct i915_priolist *to_priolist(struct rb_node *rb) @@ -93,12 +93,17 @@ static inline struct i915_priolist *to_priolist(struct rb_node *rb)
@ -472,7 +472,7 @@ index 46cd0e70a..e84c805f7 100644
#include "selftests/intel_guc.c" #include "selftests/intel_guc.c"
#endif #endif
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.h b/drivers/gpu/drm/i915/intel_guc_submission.h diff --git a/drivers/gpu/drm/i915/intel_guc_submission.h b/drivers/gpu/drm/i915/intel_guc_submission.h
index aa5e6749c..c9e5c14e7 100644 index aa5e6749c925..c9e5c14e7f67 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.h --- a/drivers/gpu/drm/i915/intel_guc_submission.h
+++ b/drivers/gpu/drm/i915/intel_guc_submission.h +++ b/drivers/gpu/drm/i915/intel_guc_submission.h
@@ -84,5 +84,9 @@ void intel_guc_submission_disable(struct intel_guc *guc); @@ -84,5 +84,9 @@ void intel_guc_submission_disable(struct intel_guc *guc);
@ -487,7 +487,7 @@ index aa5e6749c..c9e5c14e7 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 000000000..3d3c35398 index 000000000000..3d3c353986f7
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/i915/intel_ipts.c +++ b/drivers/gpu/drm/i915/intel_ipts.c
@@ -0,0 +1,651 @@ @@ -0,0 +1,651 @@
@ -1144,7 +1144,7 @@ index 000000000..3d3c35398
+} +}
diff --git a/drivers/gpu/drm/i915/intel_ipts.h b/drivers/gpu/drm/i915/intel_ipts.h diff --git a/drivers/gpu/drm/i915/intel_ipts.h b/drivers/gpu/drm/i915/intel_ipts.h
new file mode 100644 new file mode 100644
index 000000000..a6965d102 index 000000000000..a6965d102417
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/i915/intel_ipts.h +++ b/drivers/gpu/drm/i915/intel_ipts.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
@ -1183,7 +1183,7 @@ index 000000000..a6965d102
+ +
+#endif //_INTEL_IPTS_H_ +#endif //_INTEL_IPTS_H_
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 11e5a8661..4adf38cad 100644 index 11e5a86610bf..4adf38cad6da 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c --- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -166,8 +166,8 @@ @@ -166,8 +166,8 @@
@ -1237,7 +1237,7 @@ index 11e5a8661..4adf38cad 100644
struct drm_i915_gem_object *ctx_obj; struct drm_i915_gem_object *ctx_obj;
struct i915_vma *vma; struct i915_vma *vma;
diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h
index 84aa230ea..0e8008eb0 100644 index 84aa230ea27b..0e8008eb0f3a 100644
--- a/drivers/gpu/drm/i915/intel_lrc.h --- a/drivers/gpu/drm/i915/intel_lrc.h
+++ b/drivers/gpu/drm/i915/intel_lrc.h +++ b/drivers/gpu/drm/i915/intel_lrc.h
@@ -115,6 +115,12 @@ void intel_execlists_show_requests(struct intel_engine_cs *engine, @@ -115,6 +115,12 @@ void intel_execlists_show_requests(struct intel_engine_cs *engine,
@ -1254,7 +1254,7 @@ index 84aa230ea..0e8008eb0 100644
#endif /* _INTEL_LRC_H_ */ #endif /* _INTEL_LRC_H_ */
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 4ab4ce656..2d3c523ba 100644 index 4ab4ce6569e7..2d3c523ba5c7 100644
--- a/drivers/gpu/drm/i915/intel_panel.c --- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
@ -1286,7 +1286,7 @@ index 4ab4ce656..2d3c523ba 100644
static void pch_enable_backlight(const struct intel_crtc_state *crtc_state, static void pch_enable_backlight(const struct intel_crtc_state *crtc_state,
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index b603c14d0..03448d3a2 100644 index b603c14d043b..03448d3a29f2 100644
--- a/drivers/hid/hid-multitouch.c --- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c
@@ -169,6 +169,7 @@ struct mt_device { @@ -169,6 +169,7 @@ struct mt_device {
@ -1362,7 +1362,7 @@ index b603c14d0..03448d3a2 100644
INIT_LIST_HEAD(&td->applications); INIT_LIST_HEAD(&td->applications);
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 85fc77148..b697f05ea 100644 index 85fc77148d19..b697f05eaf31 100644
--- a/drivers/misc/Kconfig --- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig
@@ -500,6 +500,7 @@ source "drivers/misc/ti-st/Kconfig" @@ -500,6 +500,7 @@ source "drivers/misc/ti-st/Kconfig"
@ -1374,7 +1374,7 @@ index 85fc77148..b697f05ea 100644
source "drivers/misc/mic/Kconfig" source "drivers/misc/mic/Kconfig"
source "drivers/misc/genwqe/Kconfig" source "drivers/misc/genwqe/Kconfig"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index b9affcdaa..e681e345a 100644 index b9affcdaa3d6..e681e345a9ed 100644
--- a/drivers/misc/Makefile --- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile +++ b/drivers/misc/Makefile
@@ -45,6 +45,7 @@ obj-y += lis3lv02d/ @@ -45,6 +45,7 @@ obj-y += lis3lv02d/
@ -1387,7 +1387,7 @@ index b9affcdaa..e681e345a 100644
obj-$(CONFIG_SRAM) += sram.o obj-$(CONFIG_SRAM) += sram.o
diff --git a/drivers/misc/ipts/Kconfig b/drivers/misc/ipts/Kconfig diff --git a/drivers/misc/ipts/Kconfig b/drivers/misc/ipts/Kconfig
new file mode 100644 new file mode 100644
index 000000000..360ed3861 index 000000000000..360ed3861b82
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/Kconfig +++ b/drivers/misc/ipts/Kconfig
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
@ -1402,7 +1402,7 @@ index 000000000..360ed3861
+ Intel Kabylake + Intel Kabylake
diff --git a/drivers/misc/ipts/Makefile b/drivers/misc/ipts/Makefile diff --git a/drivers/misc/ipts/Makefile b/drivers/misc/ipts/Makefile
new file mode 100644 new file mode 100644
index 000000000..1783e9cf1 index 000000000000..1783e9cf13c9
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/Makefile +++ b/drivers/misc/ipts/Makefile
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
@ -1421,7 +1421,7 @@ index 000000000..1783e9cf1
+intel-ipts-$(CONFIG_DEBUG_FS) += ipts-dbgfs.o +intel-ipts-$(CONFIG_DEBUG_FS) += ipts-dbgfs.o
diff --git a/drivers/misc/ipts/ipts-binary-spec.h b/drivers/misc/ipts/ipts-binary-spec.h diff --git a/drivers/misc/ipts/ipts-binary-spec.h b/drivers/misc/ipts/ipts-binary-spec.h
new file mode 100644 new file mode 100644
index 000000000..87d4bc413 index 000000000000..87d4bc4133c4
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-binary-spec.h +++ b/drivers/misc/ipts/ipts-binary-spec.h
@@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
@ -1545,7 +1545,7 @@ index 000000000..87d4bc413
+#endif /* _IPTS_BINARY_SPEC_H */ +#endif /* _IPTS_BINARY_SPEC_H */
diff --git a/drivers/misc/ipts/ipts-dbgfs.c b/drivers/misc/ipts/ipts-dbgfs.c diff --git a/drivers/misc/ipts/ipts-dbgfs.c b/drivers/misc/ipts/ipts-dbgfs.c
new file mode 100644 new file mode 100644
index 000000000..7581b21f8 index 000000000000..7581b21f81e0
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-dbgfs.c +++ b/drivers/misc/ipts/ipts-dbgfs.c
@@ -0,0 +1,364 @@ @@ -0,0 +1,364 @@
@ -1915,7 +1915,7 @@ index 000000000..7581b21f8
+} +}
diff --git a/drivers/misc/ipts/ipts-gfx.c b/drivers/misc/ipts/ipts-gfx.c diff --git a/drivers/misc/ipts/ipts-gfx.c b/drivers/misc/ipts/ipts-gfx.c
new file mode 100644 new file mode 100644
index 000000000..4989a2222 index 000000000000..4989a22227d2
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-gfx.c +++ b/drivers/misc/ipts/ipts-gfx.c
@@ -0,0 +1,185 @@ @@ -0,0 +1,185 @@
@ -2106,7 +2106,7 @@ index 000000000..4989a2222
+} +}
diff --git a/drivers/misc/ipts/ipts-gfx.h b/drivers/misc/ipts/ipts-gfx.h diff --git a/drivers/misc/ipts/ipts-gfx.h b/drivers/misc/ipts/ipts-gfx.h
new file mode 100644 new file mode 100644
index 000000000..03a5f3551 index 000000000000..03a5f3551ddf
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-gfx.h +++ b/drivers/misc/ipts/ipts-gfx.h
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
@ -2136,7 +2136,7 @@ index 000000000..03a5f3551
+#endif // _IPTS_GFX_H_ +#endif // _IPTS_GFX_H_
diff --git a/drivers/misc/ipts/ipts-hid.c b/drivers/misc/ipts/ipts-hid.c diff --git a/drivers/misc/ipts/ipts-hid.c b/drivers/misc/ipts/ipts-hid.c
new file mode 100644 new file mode 100644
index 000000000..84e3fb6c3 index 000000000000..84e3fb6c34be
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-hid.c +++ b/drivers/misc/ipts/ipts-hid.c
@@ -0,0 +1,504 @@ @@ -0,0 +1,504 @@
@ -2646,7 +2646,7 @@ index 000000000..84e3fb6c3
+} +}
diff --git a/drivers/misc/ipts/ipts-hid.h b/drivers/misc/ipts/ipts-hid.h diff --git a/drivers/misc/ipts/ipts-hid.h b/drivers/misc/ipts/ipts-hid.h
new file mode 100644 new file mode 100644
index 000000000..f1b22c912 index 000000000000..f1b22c912df7
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-hid.h +++ b/drivers/misc/ipts/ipts-hid.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
@ -2686,7 +2686,7 @@ index 000000000..f1b22c912
+#endif /* _IPTS_HID_H_ */ +#endif /* _IPTS_HID_H_ */
diff --git a/drivers/misc/ipts/ipts-kernel.c b/drivers/misc/ipts/ipts-kernel.c diff --git a/drivers/misc/ipts/ipts-kernel.c b/drivers/misc/ipts/ipts-kernel.c
new file mode 100644 new file mode 100644
index 000000000..86fd359d2 index 000000000000..86fd359d2eed
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-kernel.c +++ b/drivers/misc/ipts/ipts-kernel.c
@@ -0,0 +1,1050 @@ @@ -0,0 +1,1050 @@
@ -3742,7 +3742,7 @@ index 000000000..86fd359d2
+} +}
diff --git a/drivers/misc/ipts/ipts-kernel.h b/drivers/misc/ipts/ipts-kernel.h diff --git a/drivers/misc/ipts/ipts-kernel.h b/drivers/misc/ipts/ipts-kernel.h
new file mode 100644 new file mode 100644
index 000000000..0e7f1393b index 000000000000..0e7f1393b807
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-kernel.h +++ b/drivers/misc/ipts/ipts-kernel.h
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
@ -3771,7 +3771,7 @@ index 000000000..0e7f1393b
+#endif +#endif
diff --git a/drivers/misc/ipts/ipts-mei-msgs.h b/drivers/misc/ipts/ipts-mei-msgs.h diff --git a/drivers/misc/ipts/ipts-mei-msgs.h b/drivers/misc/ipts/ipts-mei-msgs.h
new file mode 100644 new file mode 100644
index 000000000..8ca146800 index 000000000000..8ca146800a47
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-mei-msgs.h +++ b/drivers/misc/ipts/ipts-mei-msgs.h
@@ -0,0 +1,585 @@ @@ -0,0 +1,585 @@
@ -4362,7 +4362,7 @@ index 000000000..8ca146800
+#endif // _IPTS_MEI_MSGS_H_ +#endif // _IPTS_MEI_MSGS_H_
diff --git a/drivers/misc/ipts/ipts-mei.c b/drivers/misc/ipts/ipts-mei.c diff --git a/drivers/misc/ipts/ipts-mei.c b/drivers/misc/ipts/ipts-mei.c
new file mode 100644 new file mode 100644
index 000000000..199e49cb8 index 000000000000..199e49cb8d70
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-mei.c +++ b/drivers/misc/ipts/ipts-mei.c
@@ -0,0 +1,282 @@ @@ -0,0 +1,282 @@
@ -4650,7 +4650,7 @@ index 000000000..199e49cb8
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff --git a/drivers/misc/ipts/ipts-msg-handler.c b/drivers/misc/ipts/ipts-msg-handler.c diff --git a/drivers/misc/ipts/ipts-msg-handler.c b/drivers/misc/ipts/ipts-msg-handler.c
new file mode 100644 new file mode 100644
index 000000000..db5356a1c index 000000000000..db5356a1c84e
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-msg-handler.c +++ b/drivers/misc/ipts/ipts-msg-handler.c
@@ -0,0 +1,437 @@ @@ -0,0 +1,437 @@
@ -5093,7 +5093,7 @@ index 000000000..db5356a1c
+} +}
diff --git a/drivers/misc/ipts/ipts-msg-handler.h b/drivers/misc/ipts/ipts-msg-handler.h diff --git a/drivers/misc/ipts/ipts-msg-handler.h b/drivers/misc/ipts/ipts-msg-handler.h
new file mode 100644 new file mode 100644
index 000000000..f37d9ad9a index 000000000000..f37d9ad9af8c
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-msg-handler.h +++ b/drivers/misc/ipts/ipts-msg-handler.h
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
@ -5132,7 +5132,7 @@ index 000000000..f37d9ad9a
+#endif /* _IPTS_MSG_HANDLER_H */ +#endif /* _IPTS_MSG_HANDLER_H */
diff --git a/drivers/misc/ipts/ipts-resource.c b/drivers/misc/ipts/ipts-resource.c diff --git a/drivers/misc/ipts/ipts-resource.c b/drivers/misc/ipts/ipts-resource.c
new file mode 100644 new file mode 100644
index 000000000..47607ef7c index 000000000000..47607ef7c461
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-resource.c +++ b/drivers/misc/ipts/ipts-resource.c
@@ -0,0 +1,277 @@ @@ -0,0 +1,277 @@
@ -5415,7 +5415,7 @@ index 000000000..47607ef7c
+} +}
diff --git a/drivers/misc/ipts/ipts-resource.h b/drivers/misc/ipts/ipts-resource.h diff --git a/drivers/misc/ipts/ipts-resource.h b/drivers/misc/ipts/ipts-resource.h
new file mode 100644 new file mode 100644
index 000000000..7d66ac72b index 000000000000..7d66ac72b475
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-resource.h +++ b/drivers/misc/ipts/ipts-resource.h
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
@ -5451,7 +5451,7 @@ index 000000000..7d66ac72b
+#endif // _IPTS_RESOURCE_H_ +#endif // _IPTS_RESOURCE_H_
diff --git a/drivers/misc/ipts/ipts-sensor-regs.h b/drivers/misc/ipts/ipts-sensor-regs.h diff --git a/drivers/misc/ipts/ipts-sensor-regs.h b/drivers/misc/ipts/ipts-sensor-regs.h
new file mode 100644 new file mode 100644
index 000000000..96812b0eb index 000000000000..96812b0eb980
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-sensor-regs.h +++ b/drivers/misc/ipts/ipts-sensor-regs.h
@@ -0,0 +1,700 @@ @@ -0,0 +1,700 @@
@ -6157,7 +6157,7 @@ index 000000000..96812b0eb
+#endif // _TOUCH_SENSOR_REGS_H +#endif // _TOUCH_SENSOR_REGS_H
diff --git a/drivers/misc/ipts/ipts-state.h b/drivers/misc/ipts/ipts-state.h diff --git a/drivers/misc/ipts/ipts-state.h b/drivers/misc/ipts/ipts-state.h
new file mode 100644 new file mode 100644
index 000000000..39a2eaf5f index 000000000000..39a2eaf5f004
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts-state.h +++ b/drivers/misc/ipts/ipts-state.h
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
@ -6192,7 +6192,7 @@ index 000000000..39a2eaf5f
+#endif // _IPTS_STATE_H_ +#endif // _IPTS_STATE_H_
diff --git a/drivers/misc/ipts/ipts.h b/drivers/misc/ipts/ipts.h diff --git a/drivers/misc/ipts/ipts.h b/drivers/misc/ipts/ipts.h
new file mode 100644 new file mode 100644
index 000000000..9c34b55ff index 000000000000..9c34b55ff036
--- /dev/null --- /dev/null
+++ b/drivers/misc/ipts/ipts.h +++ b/drivers/misc/ipts/ipts.h
@@ -0,0 +1,200 @@ @@ -0,0 +1,200 @@
@ -6397,7 +6397,7 @@ index 000000000..9c34b55ff
+ +
+#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 6c0173772..c7872571d 100644 index 77f7dff7098d..fb99dafd44a1 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
@@ -59,6 +59,7 @@ @@ -59,6 +59,7 @@
@ -6409,7 +6409,7 @@ index 6c0173772..c7872571d 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 57cb68f5c..4044d7946 100644 index 541538eff8b1..49ab69d7a273 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
@@ -77,6 +77,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = { @@ -77,6 +77,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
@ -6422,7 +6422,7 @@ index 57cb68f5c..4044d7946 100644
{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_CFG)},
diff --git a/include/linux/intel_ipts_if.h b/include/linux/intel_ipts_if.h diff --git a/include/linux/intel_ipts_if.h b/include/linux/intel_ipts_if.h
new file mode 100644 new file mode 100644
index 000000000..bad44fb4f index 000000000000..bad44fb4f233
--- /dev/null --- /dev/null
+++ b/include/linux/intel_ipts_if.h +++ b/include/linux/intel_ipts_if.h
@@ -0,0 +1,76 @@ @@ -0,0 +1,76 @@

10
patches/5.2/0006-hid.patch
View file

@ -1,4 +1,4 @@
From fa2a845d01e823ffadd8d6061f0ddcb0a8de09b1 Mon Sep 17 00:00:00 2001 From 6f167c509db37afa78770af611d6e2fb2e764607 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:45:42 +0200 Date: Fri, 26 Jul 2019 04:45:42 +0200
Subject: [PATCH 06/12] hid Subject: [PATCH 06/12] hid
@ -11,10 +11,10 @@ Subject: [PATCH 06/12] hid
4 files changed, 86 insertions(+), 6 deletions(-) 4 files changed, 86 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index bfc584ada4eb..c54a2af1a266 100644 index 76aa474e92c1..2ce782095c63 100644
--- a/drivers/hid/hid-ids.h --- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h
@@ -821,11 +821,22 @@ @@ -822,11 +822,22 @@
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732 #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600 0x0750 #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600 0x0750
#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c
@ -125,10 +125,10 @@ index 03448d3a29f2..09ca4b1f2797 100644
{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE, { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
MT_USB_DEVICE(USB_VENDOR_ID_ASUS, MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 1549c7a2f04c..c17a3c8da927 100644 index 4fe2c3ab76f9..c9feb3f76e78 100644
--- a/drivers/hid/hid-quirks.c --- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c
@@ -111,6 +111,17 @@ static const struct hid_device_id hid_quirks[] = { @@ -112,6 +112,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_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_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 }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), HID_QUIRK_NO_INIT_REPORTS },

6
patches/5.2/0007-sdcard-reader.patch
View file

@ -1,4 +1,4 @@
From a9f00cceed704f4a4aa76f40ef4673b816080fa3 Mon Sep 17 00:00:00 2001 From 2317a00a6f49dd9d0904515fe8867212c9cd187e Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:45:55 +0200 Date: Fri, 26 Jul 2019 04:45:55 +0200
Subject: [PATCH 07/12] sdcard-reader Subject: [PATCH 07/12] sdcard-reader
@ -8,10 +8,10 @@ Subject: [PATCH 07/12] 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 2c8e60c7dbd8..f22772c79735 100644 index 2844366dc173..989fabd6ab39 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
@@ -4201,7 +4201,8 @@ void usb_enable_lpm(struct usb_device *udev) @@ -4205,7 +4205,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 ||

8
patches/5.2/0008-wifi.patch
View file

@ -1,4 +1,4 @@
From e9907ea84cfb7bf1f9a817f3587fef598f18c4f1 Mon Sep 17 00:00:00 2001 From a8ef09ff10b30d17cff5057692bfdd60021a1a49 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:46:16 +0200 Date: Fri, 26 Jul 2019 04:46:16 +0200
Subject: [PATCH 08/12] wifi Subject: [PATCH 08/12] wifi
@ -173,10 +173,10 @@ index f6da8edab7f1..51a65f26206b 100644
if ((adapter->ps_state == PS_STATE_SLEEP) && if ((adapter->ps_state == PS_STATE_SLEEP) &&
(adapter->pm_wakeup_card_req && (adapter->pm_wakeup_card_req &&
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index b025ba164412..d4027a803079 100644 index e39bb5c42c9a..8ec3275dad6d 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.h --- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -908,6 +908,7 @@ struct mwifiex_adapter { @@ -909,6 +909,7 @@ struct mwifiex_adapter {
spinlock_t main_proc_lock; spinlock_t main_proc_lock;
u32 mwifiex_processing; u32 mwifiex_processing;
u8 more_task_flag; u8 more_task_flag;
@ -184,7 +184,7 @@ index b025ba164412..d4027a803079 100644
u16 tx_buf_size; u16 tx_buf_size;
u16 curr_tx_buf_size; u16 curr_tx_buf_size;
/* sdio single port rx aggregation capability */ /* sdio single port rx aggregation capability */
@@ -1694,6 +1695,7 @@ void mwifiex_upload_device_dump(struct mwifiex_adapter *adapter); @@ -1695,6 +1696,7 @@ void mwifiex_upload_device_dump(struct mwifiex_adapter *adapter);
void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags); void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags);
void mwifiex_fw_dump_event(struct mwifiex_private *priv); void mwifiex_fw_dump_event(struct mwifiex_private *priv);
void mwifiex_queue_main_work(struct mwifiex_adapter *adapter); void mwifiex_queue_main_work(struct mwifiex_adapter *adapter);

4
patches/5.2/0009-surface3-power.patch
View file

@ -1,4 +1,4 @@
From 6a801441718660cc54b95de8dee4cf74c5e90c8c Mon Sep 17 00:00:00 2001 From 8dcbe757ce810b137ddaa746598b261de98bd6f3 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:46:48 +0200 Date: Fri, 26 Jul 2019 04:46:48 +0200
Subject: [PATCH 09/12] surface3-power Subject: [PATCH 09/12] surface3-power
@ -11,7 +11,7 @@ Subject: [PATCH 09/12] surface3-power
create mode 100644 drivers/platform/x86/surface3_power.c create mode 100644 drivers/platform/x86/surface3_power.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 4fefae580dec..25df8d2866c6 100644 index c00cb830914a..04421fe566ba 100644
--- a/drivers/platform/x86/Kconfig --- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig
@@ -1301,6 +1301,13 @@ config SURFACE_3_BUTTON @@ -1301,6 +1301,13 @@ config SURFACE_3_BUTTON

2
patches/5.2/0010-mwlwifi.patch
View file

@ -1,4 +1,4 @@
From 16181905a434e631631ec7a404036a6dd8103c30 Mon Sep 17 00:00:00 2001 From 4697bc13237488ab48dc293bb2724ca8b7179301 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:47:02 +0200 Date: Fri, 26 Jul 2019 04:47:02 +0200
Subject: [PATCH 10/12] mwlwifi Subject: [PATCH 10/12] mwlwifi

2
patches/5.2/0011-surface-lte.patch
View file

@ -1,4 +1,4 @@
From 1efb611bb6afb999ed05fb48406772a7b1d0ce29 Mon Sep 17 00:00:00 2001 From 332cb8daac70868fcec9e6c8c698e6a9318cfba6 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:47:13 +0200 Date: Fri, 26 Jul 2019 04:47:13 +0200
Subject: [PATCH 11/12] surface-lte Subject: [PATCH 11/12] surface-lte

4
patches/5.2/0012-surfacebook2-dgpu.patch
View file

@ -1,4 +1,4 @@
From 52ba324703a43f17f8f1bde749daa3d29a654b9d Mon Sep 17 00:00:00 2001 From 687a19de3665bf1408b8917796987399cd4bd4f1 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 Jul 2019 04:47:27 +0200 Date: Fri, 26 Jul 2019 04:47:27 +0200
Subject: [PATCH 12/12] surfacebook2-dgpu Subject: [PATCH 12/12] surfacebook2-dgpu
@ -11,7 +11,7 @@ Subject: [PATCH 12/12] surfacebook2-dgpu
create mode 100644 drivers/platform/x86/surfacebook2_dgpu_hps.c create mode 100644 drivers/platform/x86/surfacebook2_dgpu_hps.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 25df8d2866c6..fb52b557198e 100644 index 04421fe566ba..cb0a53da4de1 100644
--- a/drivers/platform/x86/Kconfig --- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig
@@ -484,6 +484,15 @@ config SURFACE3_WMI @@ -484,6 +484,15 @@ config SURFACE3_WMI