|
@@ -1,7 +1,7 @@
|
|
|
-From 20794de213eeb51ec12cccdf6705ff73ec79a804 Mon Sep 17 00:00:00 2001
|
|
|
+From 2c053417d2e08043a1931b8e11b174d882ce9b49 Mon Sep 17 00:00:00 2001
|
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
Date: Sat, 28 Sep 2019 17:58:17 +0200
|
|
|
-Subject: [PATCH 7/8] ipts
|
|
|
+Subject: [PATCH 8/9] ipts
|
|
|
|
|
|
---
|
|
|
drivers/gpu/drm/i915/Makefile | 3 +
|
|
@@ -89,7 +89,7 @@ Subject: [PATCH 7/8] ipts
|
|
|
create mode 100644 include/linux/ipts.h
|
|
|
|
|
|
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
|
|
|
-index 5794f102f9b8..6ae0e91a213a 100644
|
|
|
+index 5794f102f9b8f..6ae0e91a213af 100644
|
|
|
--- a/drivers/gpu/drm/i915/Makefile
|
|
|
+++ b/drivers/gpu/drm/i915/Makefile
|
|
|
@@ -155,6 +155,9 @@ i915-y += dvo_ch7017.o \
|
|
@@ -103,7 +103,7 @@ index 5794f102f9b8..6ae0e91a213a 100644
|
|
|
i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
|
|
|
i915-$(CONFIG_DRM_I915_SELFTEST) += \
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
|
|
|
-index e063e98d1e82..99becb6aed68 100644
|
|
|
+index e063e98d1e82e..99becb6aed688 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_debugfs.c
|
|
|
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
|
|
|
@@ -31,6 +31,7 @@
|
|
@@ -191,7 +191,7 @@ index e063e98d1e82..99becb6aed68 100644
|
|
|
|
|
|
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
|
|
|
-index b0d76a7a0946..81fba8e5ab05 100644
|
|
|
+index b0d76a7a0946f..81fba8e5ab050 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_drv.c
|
|
|
+++ b/drivers/gpu/drm/i915/i915_drv.c
|
|
|
@@ -47,11 +47,12 @@
|
|
@@ -229,7 +229,7 @@ index b0d76a7a0946..81fba8e5ab05 100644
|
|
|
|
|
|
if (i915_gem_suspend(dev_priv))
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
|
|
|
-index db2e9af49ae6..99bc0c92c411 100644
|
|
|
+index db2e9af49ae6f..99bc0c92c4111 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_drv.h
|
|
|
+++ b/drivers/gpu/drm/i915/i915_drv.h
|
|
|
@@ -3232,6 +3232,9 @@ void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj,
|
|
@@ -243,7 +243,7 @@ index db2e9af49ae6..99bc0c92c411 100644
|
|
|
__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
|
|
|
-index ef383fd42988..89da4ff09431 100644
|
|
|
+index ef383fd429885..89da4ff094312 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_gem_context.c
|
|
|
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
|
|
|
@@ -472,6 +472,18 @@ static bool needs_preempt_context(struct drm_i915_private *i915)
|
|
@@ -266,7 +266,7 @@ index ef383fd42988..89da4ff09431 100644
|
|
|
{
|
|
|
struct i915_gem_context *ctx;
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
|
|
|
-index b7c398232136..adf168aed2fe 100644
|
|
|
+index b7c3982321369..adf168aed2fe3 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_irq.c
|
|
|
+++ b/drivers/gpu/drm/i915/i915_irq.c
|
|
|
@@ -36,6 +36,7 @@
|
|
@@ -298,7 +298,7 @@ index b7c398232136..adf168aed2fe 100644
|
|
|
GT_RENDER_USER_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
|
|
|
-index 295e981e4a39..84415814c007 100644
|
|
|
+index 295e981e4a398..84415814c0070 100644
|
|
|
--- a/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,
|
|
@@ -314,7 +314,7 @@ index 295e981e4a39..84415814c007 100644
|
|
|
i915_param_named(guc_log_level, int, 0400,
|
|
|
"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
|
|
|
-index 6c4d4a21474b..4ab800c3de6d 100644
|
|
|
+index 6c4d4a21474b5..4ab800c3de6d0 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_params.h
|
|
|
+++ b/drivers/gpu/drm/i915/i915_params.h
|
|
|
@@ -46,7 +46,7 @@ struct drm_printer;
|
|
@@ -337,7 +337,7 @@ index 6c4d4a21474b..4ab800c3de6d 100644
|
|
|
#define MEMBER(T, member, ...) T member;
|
|
|
struct i915_params {
|
|
|
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
|
|
|
-index 4121928a495e..8967376accf3 100644
|
|
|
+index 4121928a495e0..8967376accf30 100644
|
|
|
--- a/drivers/gpu/drm/i915/intel_guc.h
|
|
|
+++ b/drivers/gpu/drm/i915/intel_guc.h
|
|
|
@@ -69,6 +69,7 @@ struct intel_guc {
|
|
@@ -349,7 +349,7 @@ index 4121928a495e..8967376accf3 100644
|
|
|
struct guc_preempt_work preempt_work[I915_NUM_ENGINES];
|
|
|
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
|
|
|
-index 4aa5e6463e7b..da80c5f17fee 100644
|
|
|
+index 4aa5e6463e7b7..da80c5f17feea 100644
|
|
|
--- a/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)
|
|
@@ -481,7 +481,7 @@ index 4aa5e6463e7b..da80c5f17fee 100644
|
|
|
#include "selftests/intel_guc.c"
|
|
|
#endif
|
|
|
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.h b/drivers/gpu/drm/i915/intel_guc_submission.h
|
|
|
-index fb081cefef93..71fc7986585a 100644
|
|
|
+index fb081cefef935..71fc7986585ab 100644
|
|
|
--- a/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);
|
|
@@ -496,7 +496,7 @@ index fb081cefef93..71fc7986585a 100644
|
|
|
#endif
|
|
|
diff --git a/drivers/gpu/drm/i915/intel_ipts.c b/drivers/gpu/drm/i915/intel_ipts.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..c1199074924a
|
|
|
+index 0000000000000..c1199074924a0
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/gpu/drm/i915/intel_ipts.c
|
|
|
@@ -0,0 +1,650 @@
|
|
@@ -1152,7 +1152,7 @@ index 000000000000..c1199074924a
|
|
|
+}
|
|
|
diff --git a/drivers/gpu/drm/i915/intel_ipts.h b/drivers/gpu/drm/i915/intel_ipts.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..67f90b72f237
|
|
|
+index 0000000000000..67f90b72f2378
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/gpu/drm/i915/intel_ipts.h
|
|
|
@@ -0,0 +1,34 @@
|
|
@@ -1191,7 +1191,7 @@ index 000000000000..67f90b72f237
|
|
|
+
|
|
|
+#endif //_INTEL_IPTS_H_
|
|
|
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
|
|
|
-index 13e97faabaa7..a4af67d3d6ff 100644
|
|
|
+index 13e97faabaa74..a4af67d3d6ffd 100644
|
|
|
--- a/drivers/gpu/drm/i915/intel_lrc.c
|
|
|
+++ b/drivers/gpu/drm/i915/intel_lrc.c
|
|
|
@@ -164,9 +164,6 @@
|
|
@@ -1242,7 +1242,7 @@ index 13e97faabaa7..a4af67d3d6ff 100644
|
|
|
struct intel_context *ce)
|
|
|
{
|
|
|
diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h
|
|
|
-index 4dfb78e3ec7e..32159231a16e 100644
|
|
|
+index 4dfb78e3ec7e4..32159231a16e7 100644
|
|
|
--- a/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);
|
|
@@ -1259,7 +1259,7 @@ index 4dfb78e3ec7e..32159231a16e 100644
|
|
|
+
|
|
|
#endif /* _INTEL_LRC_H_ */
|
|
|
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
|
|
|
-index 4a9f139e7b73..c137a57f6702 100644
|
|
|
+index 4a9f139e7b738..c137a57f67026 100644
|
|
|
--- a/drivers/gpu/drm/i915/intel_panel.c
|
|
|
+++ b/drivers/gpu/drm/i915/intel_panel.c
|
|
|
@@ -34,6 +34,7 @@
|
|
@@ -1291,7 +1291,7 @@ index 4a9f139e7b73..c137a57f6702 100644
|
|
|
|
|
|
static void pch_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
|
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
|
|
|
-index 3726eacdf65d..77263b5f5915 100644
|
|
|
+index 3726eacdf65de..77263b5f5915a 100644
|
|
|
--- a/drivers/misc/Kconfig
|
|
|
+++ b/drivers/misc/Kconfig
|
|
|
@@ -520,6 +520,7 @@ source "drivers/misc/ti-st/Kconfig"
|
|
@@ -1303,7 +1303,7 @@ index 3726eacdf65d..77263b5f5915 100644
|
|
|
source "drivers/misc/mic/Kconfig"
|
|
|
source "drivers/misc/genwqe/Kconfig"
|
|
|
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
|
|
|
-index af22bbc3d00c..eb1eb0d58c32 100644
|
|
|
+index af22bbc3d00cb..eb1eb0d58c327 100644
|
|
|
--- a/drivers/misc/Makefile
|
|
|
+++ b/drivers/misc/Makefile
|
|
|
@@ -44,6 +44,7 @@ obj-y += lis3lv02d/
|
|
@@ -1316,7 +1316,7 @@ index af22bbc3d00c..eb1eb0d58c32 100644
|
|
|
obj-$(CONFIG_SRAM) += sram.o
|
|
|
diff --git a/drivers/misc/ipts/Kconfig b/drivers/misc/ipts/Kconfig
|
|
|
new file mode 100644
|
|
|
-index 000000000000..900d2c58ca74
|
|
|
+index 0000000000000..900d2c58ca74c
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/Kconfig
|
|
|
@@ -0,0 +1,12 @@
|
|
@@ -1334,7 +1334,7 @@ index 000000000000..900d2c58ca74
|
|
|
+source "drivers/misc/ipts/companion/Kconfig"
|
|
|
diff --git a/drivers/misc/ipts/Makefile b/drivers/misc/ipts/Makefile
|
|
|
new file mode 100644
|
|
|
-index 000000000000..bb3982f48afc
|
|
|
+index 0000000000000..bb3982f48afcb
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/Makefile
|
|
|
@@ -0,0 +1,19 @@
|
|
@@ -1359,7 +1359,7 @@ index 000000000000..bb3982f48afc
|
|
|
+obj-y += companion/
|
|
|
diff --git a/drivers/misc/ipts/companion.c b/drivers/misc/ipts/companion.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..8f66b852f137
|
|
|
+index 0000000000000..8f66b852f1371
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/companion.c
|
|
|
@@ -0,0 +1,211 @@
|
|
@@ -1576,7 +1576,7 @@ index 000000000000..8f66b852f137
|
|
|
+}
|
|
|
diff --git a/drivers/misc/ipts/companion.h b/drivers/misc/ipts/companion.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..7a1e4b388c40
|
|
|
+index 0000000000000..7a1e4b388c40a
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/companion.h
|
|
|
@@ -0,0 +1,25 @@
|
|
@@ -1607,7 +1607,7 @@ index 000000000000..7a1e4b388c40
|
|
|
+#endif // _IPTS_COMPANION_H_
|
|
|
diff --git a/drivers/misc/ipts/companion/Kconfig b/drivers/misc/ipts/companion/Kconfig
|
|
|
new file mode 100644
|
|
|
-index 000000000000..ef17d9bb5242
|
|
|
+index 0000000000000..ef17d9bb5242f
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/companion/Kconfig
|
|
|
@@ -0,0 +1,8 @@
|
|
@@ -1621,7 +1621,7 @@ index 000000000000..ef17d9bb5242
|
|
|
+ If you have a Microsoft Surface using IPTS, select y or m here.
|
|
|
diff --git a/drivers/misc/ipts/companion/Makefile b/drivers/misc/ipts/companion/Makefile
|
|
|
new file mode 100644
|
|
|
-index 000000000000..b37f2f59937a
|
|
|
+index 0000000000000..b37f2f59937a8
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/companion/Makefile
|
|
|
@@ -0,0 +1,2 @@
|
|
@@ -1629,7 +1629,7 @@ index 000000000000..b37f2f59937a
|
|
|
+obj-$(CONFIG_INTEL_IPTS_SURFACE)+= ipts-surface.o
|
|
|
diff --git a/drivers/misc/ipts/companion/ipts-surface.c b/drivers/misc/ipts/companion/ipts-surface.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..a717dfcdfeba
|
|
|
+index 0000000000000..a717dfcdfeba7
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/companion/ipts-surface.c
|
|
|
@@ -0,0 +1,157 @@
|
|
@@ -1792,7 +1792,7 @@ index 000000000000..a717dfcdfeba
|
|
|
+IPTS_SURFACE_FIRMWARE("MSHW0137");
|
|
|
diff --git a/drivers/misc/ipts/dbgfs.c b/drivers/misc/ipts/dbgfs.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..fd9388de17e7
|
|
|
+index 0000000000000..fd9388de17e78
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/dbgfs.c
|
|
|
@@ -0,0 +1,277 @@
|
|
@@ -2075,7 +2075,7 @@ index 000000000000..fd9388de17e7
|
|
|
+}
|
|
|
diff --git a/drivers/misc/ipts/gfx.c b/drivers/misc/ipts/gfx.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..b8900f514c75
|
|
|
+index 0000000000000..b8900f514c756
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/gfx.c
|
|
|
@@ -0,0 +1,180 @@
|
|
@@ -2261,7 +2261,7 @@ index 000000000000..b8900f514c75
|
|
|
+}
|
|
|
diff --git a/drivers/misc/ipts/gfx.h b/drivers/misc/ipts/gfx.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..2880e122e9f9
|
|
|
+index 0000000000000..2880e122e9f96
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/gfx.h
|
|
|
@@ -0,0 +1,25 @@
|
|
@@ -2292,7 +2292,7 @@ index 000000000000..2880e122e9f9
|
|
|
+#endif // _IPTS_GFX_H_
|
|
|
diff --git a/drivers/misc/ipts/hid.c b/drivers/misc/ipts/hid.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..1b7ad2a774a8
|
|
|
+index 0000000000000..1b7ad2a774a86
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/hid.c
|
|
|
@@ -0,0 +1,469 @@
|
|
@@ -2767,7 +2767,7 @@ index 000000000000..1b7ad2a774a8
|
|
|
+}
|
|
|
diff --git a/drivers/misc/ipts/hid.h b/drivers/misc/ipts/hid.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..c943979e0198
|
|
|
+index 0000000000000..c943979e01983
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/hid.h
|
|
|
@@ -0,0 +1,21 @@
|
|
@@ -2794,7 +2794,7 @@ index 000000000000..c943979e0198
|
|
|
+#endif // _IPTS_HID_H_
|
|
|
diff --git a/drivers/misc/ipts/ipts.c b/drivers/misc/ipts/ipts.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..dfafabf8dd94
|
|
|
+index 0000000000000..dfafabf8dd949
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts.c
|
|
|
@@ -0,0 +1,62 @@
|
|
@@ -2862,7 +2862,7 @@ index 000000000000..dfafabf8dd94
|
|
|
+}
|
|
|
diff --git a/drivers/misc/ipts/ipts.h b/drivers/misc/ipts/ipts.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..32eb3ffd68a3
|
|
|
+index 0000000000000..32eb3ffd68a3b
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts.h
|
|
|
@@ -0,0 +1,172 @@
|
|
@@ -3040,7 +3040,7 @@ index 000000000000..32eb3ffd68a3
|
|
|
+#endif // _IPTS_H_
|
|
|
diff --git a/drivers/misc/ipts/kernel.c b/drivers/misc/ipts/kernel.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..a2c43228e2c7
|
|
|
+index 0000000000000..a2c43228e2c7d
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/kernel.c
|
|
|
@@ -0,0 +1,1047 @@
|
|
@@ -4093,7 +4093,7 @@ index 000000000000..a2c43228e2c7
|
|
|
+}
|
|
|
diff --git a/drivers/misc/ipts/kernel.h b/drivers/misc/ipts/kernel.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..7be45da01cfc
|
|
|
+index 0000000000000..7be45da01cfc0
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/kernel.h
|
|
|
@@ -0,0 +1,17 @@
|
|
@@ -4116,7 +4116,7 @@ index 000000000000..7be45da01cfc
|
|
|
+#endif // _IPTS_KERNEL_H_
|
|
|
diff --git a/drivers/misc/ipts/mei-msgs.h b/drivers/misc/ipts/mei-msgs.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..036b74f7234e
|
|
|
+index 0000000000000..036b74f7234ef
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/mei-msgs.h
|
|
|
@@ -0,0 +1,901 @@
|
|
@@ -5023,7 +5023,7 @@ index 000000000000..036b74f7234e
|
|
|
+#endif // _IPTS_MEI_MSGS_H_
|
|
|
diff --git a/drivers/misc/ipts/mei.c b/drivers/misc/ipts/mei.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..03b5d747a728
|
|
|
+index 0000000000000..03b5d747a728f
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/mei.c
|
|
|
@@ -0,0 +1,238 @@
|
|
@@ -5267,7 +5267,7 @@ index 000000000000..03b5d747a728
|
|
|
+MODULE_LICENSE("GPL");
|
|
|
diff --git a/drivers/misc/ipts/msg-handler.c b/drivers/misc/ipts/msg-handler.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..9431b1dfc6e0
|
|
|
+index 0000000000000..9431b1dfc6e06
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/msg-handler.c
|
|
|
@@ -0,0 +1,405 @@
|
|
@@ -5678,7 +5678,7 @@ index 000000000000..9431b1dfc6e0
|
|
|
+}
|
|
|
diff --git a/drivers/misc/ipts/msg-handler.h b/drivers/misc/ipts/msg-handler.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..eca4238adf4b
|
|
|
+index 0000000000000..eca4238adf4b1
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/msg-handler.h
|
|
|
@@ -0,0 +1,28 @@
|
|
@@ -5712,7 +5712,7 @@ index 000000000000..eca4238adf4b
|
|
|
+#endif /* _IPTS_MSG_HANDLER_H */
|
|
|
diff --git a/drivers/misc/ipts/params.c b/drivers/misc/ipts/params.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..3ea76ca8342a
|
|
|
+index 0000000000000..3ea76ca8342a9
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/params.c
|
|
|
@@ -0,0 +1,42 @@
|
|
@@ -5760,7 +5760,7 @@ index 000000000000..3ea76ca8342a
|
|
|
+
|
|
|
diff --git a/drivers/misc/ipts/params.h b/drivers/misc/ipts/params.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..c20546bacb08
|
|
|
+index 0000000000000..c20546bacb086
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/params.h
|
|
|
@@ -0,0 +1,25 @@
|
|
@@ -5791,7 +5791,7 @@ index 000000000000..c20546bacb08
|
|
|
+#endif // _IPTS_PARAMS_H_
|
|
|
diff --git a/drivers/misc/ipts/resource.c b/drivers/misc/ipts/resource.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..cfd212f2cac0
|
|
|
+index 0000000000000..cfd212f2cac09
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/resource.c
|
|
|
@@ -0,0 +1,291 @@
|
|
@@ -6088,7 +6088,7 @@ index 000000000000..cfd212f2cac0
|
|
|
+}
|
|
|
diff --git a/drivers/misc/ipts/resource.h b/drivers/misc/ipts/resource.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..27b9c17fcb89
|
|
|
+index 0000000000000..27b9c17fcb89a
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/resource.h
|
|
|
@@ -0,0 +1,26 @@
|
|
@@ -6120,7 +6120,7 @@ index 000000000000..27b9c17fcb89
|
|
|
+#endif // _IPTS_RESOURCE_H_
|
|
|
diff --git a/drivers/misc/ipts/sensor-regs.h b/drivers/misc/ipts/sensor-regs.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..c1afab48249b
|
|
|
+index 0000000000000..c1afab48249b7
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/sensor-regs.h
|
|
|
@@ -0,0 +1,834 @@
|
|
@@ -6960,7 +6960,7 @@ index 000000000000..c1afab48249b
|
|
|
+#endif // _IPTS_SENSOR_REGS_H_
|
|
|
diff --git a/drivers/misc/ipts/state.h b/drivers/misc/ipts/state.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..ef73d28db47c
|
|
|
+index 0000000000000..ef73d28db47cc
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/state.h
|
|
|
@@ -0,0 +1,22 @@
|
|
@@ -6987,7 +6987,7 @@ index 000000000000..ef73d28db47c
|
|
|
+
|
|
|
+#endif // _IPTS_STATE_H_
|
|
|
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
|
|
|
-index 2ac1dc5104b7..5daa857a4938 100644
|
|
|
+index 2ac1dc5104b7a..5daa857a49389 100644
|
|
|
--- a/drivers/misc/mei/hw-me-regs.h
|
|
|
+++ b/drivers/misc/mei/hw-me-regs.h
|
|
|
@@ -119,6 +119,7 @@
|
|
@@ -6999,7 +6999,7 @@ index 2ac1dc5104b7..5daa857a4938 100644
|
|
|
#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
|
|
|
-index b4bf12f27caf..34f4338fa641 100644
|
|
|
+index b4bf12f27caf5..34f4338fa6417 100644
|
|
|
--- a/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[] = {
|
|
@@ -7012,7 +7012,7 @@ index b4bf12f27caf..34f4338fa641 100644
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_CFG)},
|
|
|
diff --git a/include/linux/ipts-binary.h b/include/linux/ipts-binary.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..98b54d74ff88
|
|
|
+index 0000000000000..98b54d74ff888
|
|
|
--- /dev/null
|
|
|
+++ b/include/linux/ipts-binary.h
|
|
|
@@ -0,0 +1,140 @@
|
|
@@ -7158,7 +7158,7 @@ index 000000000000..98b54d74ff88
|
|
|
+#endif // IPTS_BINARY_H
|
|
|
diff --git a/include/linux/ipts-companion.h b/include/linux/ipts-companion.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..de31f5e0b186
|
|
|
+index 0000000000000..de31f5e0b186b
|
|
|
--- /dev/null
|
|
|
+++ b/include/linux/ipts-companion.h
|
|
|
@@ -0,0 +1,29 @@
|
|
@@ -7193,7 +7193,7 @@ index 000000000000..de31f5e0b186
|
|
|
+#endif // IPTS_COMPANION_H
|
|
|
diff --git a/include/linux/ipts-gfx.h b/include/linux/ipts-gfx.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..cb9d98fe96e4
|
|
|
+index 0000000000000..cb9d98fe96e4b
|
|
|
--- /dev/null
|
|
|
+++ b/include/linux/ipts-gfx.h
|
|
|
@@ -0,0 +1,86 @@
|
|
@@ -7285,7 +7285,7 @@ index 000000000000..cb9d98fe96e4
|
|
|
+#endif // IPTS_GFX_H
|
|
|
diff --git a/include/linux/ipts.h b/include/linux/ipts.h
|
|
|
new file mode 100644
|
|
|
-index 000000000000..f229a3436851
|
|
|
+index 0000000000000..f229a34368516
|
|
|
--- /dev/null
|
|
|
+++ b/include/linux/ipts.h
|
|
|
@@ -0,0 +1,19 @@
|
|
@@ -7309,5 +7309,5 @@ index 000000000000..f229a3436851
|
|
|
+
|
|
|
+#endif // IPTS_H
|
|
|
--
|
|
|
-2.27.0
|
|
|
+2.28.0
|
|
|
|