|
@@ -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>
|
|
|
Date: Tue, 10 Sep 2019 21:52:46 +0900
|
|
|
Subject: [PATCH 05/12] ipts
|
|
@@ -71,7 +71,7 @@ Subject: [PATCH 05/12] ipts
|
|
|
create mode 100644 include/linux/intel_ipts_if.h
|
|
|
|
|
|
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
|
|
|
+++ b/drivers/gpu/drm/i915/Makefile
|
|
|
@@ -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_SELFTEST) += \
|
|
|
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
|
|
|
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
|
|
|
@@ -31,6 +31,7 @@
|
|
@@ -173,7 +173,7 @@ index f9ce35da4..c8b88b1b7 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 f8cfd16be..f48122746 100644
|
|
|
+index a4b4ab7b9f8e..19a1d35c2315 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_drv.c
|
|
|
+++ b/drivers/gpu/drm/i915/i915_drv.c
|
|
|
@@ -53,6 +53,7 @@
|
|
@@ -194,7 +194,7 @@ index f8cfd16be..f48122746 100644
|
|
|
return 0;
|
|
|
|
|
|
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 pci_dev *pdev = dev_priv->drm.pdev;
|
|
|
|
|
@@ -205,7 +205,7 @@ index f8cfd16be..f48122746 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 d6c25bea4..d6b507fb7 100644
|
|
|
+index d6c25bea4382..d6b507fb7626 100644
|
|
|
--- a/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,
|
|
@@ -219,7 +219,7 @@ index d6c25bea4..d6b507fb7 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 b10770cfc..0222f0a55 100644
|
|
|
+index b10770cfccd2..0222f0a55262 100644
|
|
|
--- a/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)
|
|
@@ -242,7 +242,7 @@ index b10770cfc..0222f0a55 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 298779693..f98fdb5fc 100644
|
|
|
+index 29877969310d..f98fdb5fc282 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_irq.c
|
|
|
+++ b/drivers/gpu/drm/i915/i915_irq.c
|
|
|
@@ -36,6 +36,7 @@
|
|
@@ -274,7 +274,7 @@ index 298779693..f98fdb5fc 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 295e981e4..84415814c 100644
|
|
|
+index 295e981e4a39..84415814c007 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,
|
|
@@ -290,7 +290,7 @@ index 295e981e4..84415814c 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 6c4d4a214..4ab800c3d 100644
|
|
|
+index 6c4d4a21474b..4ab800c3de6d 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_params.h
|
|
|
+++ b/drivers/gpu/drm/i915/i915_params.h
|
|
|
@@ -46,7 +46,7 @@ struct drm_printer;
|
|
@@ -313,7 +313,7 @@ index 6c4d4a214..4ab800c3d 100644
|
|
|
#define MEMBER(T, member, ...) T member;
|
|
|
struct i915_params {
|
|
|
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
|
|
|
+++ b/drivers/gpu/drm/i915/intel_dp.c
|
|
|
@@ -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,
|
|
|
DP_SET_POWER_D3);
|
|
|
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
|
|
|
+++ b/drivers/gpu/drm/i915/intel_guc.h
|
|
|
@@ -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 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 4aa5e6463..f60c42390 100644
|
|
|
+index 4aa5e6463e7b..f60c42390006 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)
|
|
@@ -473,7 +473,7 @@ index 4aa5e6463..f60c42390 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 fb081cefe..71fc79865 100644
|
|
|
+index fb081cefef93..71fc7986585a 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);
|
|
@@ -488,7 +488,7 @@ index fb081cefe..71fc79865 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 000000000..8ad1d22df
|
|
|
+index 000000000000..8ad1d22df5cd
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/gpu/drm/i915/intel_ipts.c
|
|
|
@@ -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
|
|
|
new file mode 100644
|
|
|
-index 000000000..a6965d102
|
|
|
+index 000000000000..a6965d102417
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/gpu/drm/i915/intel_ipts.h
|
|
|
@@ -0,0 +1,34 @@
|
|
@@ -1184,7 +1184,7 @@ index 000000000..a6965d102
|
|
|
+
|
|
|
+#endif //_INTEL_IPTS_H_
|
|
|
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
|
|
|
+++ b/drivers/gpu/drm/i915/intel_lrc.c
|
|
|
@@ -164,9 +164,6 @@
|
|
@@ -1235,7 +1235,7 @@ index 6937ef0b4..f669087d6 100644
|
|
|
struct intel_context *ce)
|
|
|
{
|
|
|
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
|
|
|
+++ b/drivers/gpu/drm/i915/intel_lrc.h
|
|
|
@@ -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_ */
|
|
|
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
|
|
|
+++ b/drivers/gpu/drm/i915/intel_panel.c
|
|
|
@@ -34,6 +34,7 @@
|
|
@@ -1284,7 +1284,7 @@ index 4a9f139e7..a800b93cf 100644
|
|
|
|
|
|
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
|
|
|
-index f9167d0e0..28b729c9d 100644
|
|
|
+index f9167d0e095c..28b729c9d804 100644
|
|
|
--- a/drivers/hid/hid-multitouch.c
|
|
|
+++ b/drivers/hid/hid-multitouch.c
|
|
|
@@ -173,6 +173,7 @@ struct mt_device {
|
|
@@ -1360,7 +1360,7 @@ index f9167d0e0..28b729c9d 100644
|
|
|
|
|
|
INIT_LIST_HEAD(&td->applications);
|
|
|
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
|
|
|
-index 3726eacdf..77263b5f5 100644
|
|
|
+index 3726eacdf65d..77263b5f5915 100644
|
|
|
--- a/drivers/misc/Kconfig
|
|
|
+++ b/drivers/misc/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/genwqe/Kconfig"
|
|
|
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
|
|
|
-index af22bbc3d..eb1eb0d58 100644
|
|
|
+index af22bbc3d00c..eb1eb0d58c32 100644
|
|
|
--- a/drivers/misc/Makefile
|
|
|
+++ b/drivers/misc/Makefile
|
|
|
@@ -44,6 +44,7 @@ obj-y += lis3lv02d/
|
|
@@ -1385,7 +1385,7 @@ index af22bbc3d..eb1eb0d58 100644
|
|
|
obj-$(CONFIG_SRAM) += sram.o
|
|
|
diff --git a/drivers/misc/ipts/Kconfig b/drivers/misc/ipts/Kconfig
|
|
|
new file mode 100644
|
|
|
-index 000000000..360ed3861
|
|
|
+index 000000000000..360ed3861b82
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/Kconfig
|
|
|
@@ -0,0 +1,9 @@
|
|
@@ -1400,7 +1400,7 @@ index 000000000..360ed3861
|
|
|
+ Intel Kabylake
|
|
|
diff --git a/drivers/misc/ipts/Makefile b/drivers/misc/ipts/Makefile
|
|
|
new file mode 100644
|
|
|
-index 000000000..1783e9cf1
|
|
|
+index 000000000000..1783e9cf13c9
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/Makefile
|
|
|
@@ -0,0 +1,13 @@
|
|
@@ -1419,7 +1419,7 @@ index 000000000..1783e9cf1
|
|
|
+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
|
|
|
new file mode 100644
|
|
|
-index 000000000..87d4bc413
|
|
|
+index 000000000000..87d4bc4133c4
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-binary-spec.h
|
|
|
@@ -0,0 +1,118 @@
|
|
@@ -1543,7 +1543,7 @@ index 000000000..87d4bc413
|
|
|
+#endif /* _IPTS_BINARY_SPEC_H */
|
|
|
diff --git a/drivers/misc/ipts/ipts-dbgfs.c b/drivers/misc/ipts/ipts-dbgfs.c
|
|
|
new file mode 100644
|
|
|
-index 000000000..7581b21f8
|
|
|
+index 000000000000..7581b21f81e0
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-dbgfs.c
|
|
|
@@ -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
|
|
|
new file mode 100644
|
|
|
-index 000000000..4989a2222
|
|
|
+index 000000000000..4989a22227d2
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-gfx.c
|
|
|
@@ -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
|
|
|
new file mode 100644
|
|
|
-index 000000000..03a5f3551
|
|
|
+index 000000000000..03a5f3551ddf
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-gfx.h
|
|
|
@@ -0,0 +1,24 @@
|
|
@@ -2134,7 +2134,7 @@ index 000000000..03a5f3551
|
|
|
+#endif // _IPTS_GFX_H_
|
|
|
diff --git a/drivers/misc/ipts/ipts-hid.c b/drivers/misc/ipts/ipts-hid.c
|
|
|
new file mode 100644
|
|
|
-index 000000000..84e3fb6c3
|
|
|
+index 000000000000..84e3fb6c34be
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-hid.c
|
|
|
@@ -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
|
|
|
new file mode 100644
|
|
|
-index 000000000..f1b22c912
|
|
|
+index 000000000000..f1b22c912df7
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-hid.h
|
|
|
@@ -0,0 +1,34 @@
|
|
@@ -2684,7 +2684,7 @@ index 000000000..f1b22c912
|
|
|
+#endif /* _IPTS_HID_H_ */
|
|
|
diff --git a/drivers/misc/ipts/ipts-kernel.c b/drivers/misc/ipts/ipts-kernel.c
|
|
|
new file mode 100644
|
|
|
-index 000000000..86fd359d2
|
|
|
+index 000000000000..86fd359d2eed
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-kernel.c
|
|
|
@@ -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
|
|
|
new file mode 100644
|
|
|
-index 000000000..0e7f1393b
|
|
|
+index 000000000000..0e7f1393b807
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-kernel.h
|
|
|
@@ -0,0 +1,23 @@
|
|
@@ -3769,7 +3769,7 @@ index 000000000..0e7f1393b
|
|
|
+#endif
|
|
|
diff --git a/drivers/misc/ipts/ipts-mei-msgs.h b/drivers/misc/ipts/ipts-mei-msgs.h
|
|
|
new file mode 100644
|
|
|
-index 000000000..8ca146800
|
|
|
+index 000000000000..8ca146800a47
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-mei-msgs.h
|
|
|
@@ -0,0 +1,585 @@
|
|
@@ -4360,7 +4360,7 @@ index 000000000..8ca146800
|
|
|
+#endif // _IPTS_MEI_MSGS_H_
|
|
|
diff --git a/drivers/misc/ipts/ipts-mei.c b/drivers/misc/ipts/ipts-mei.c
|
|
|
new file mode 100644
|
|
|
-index 000000000..199e49cb8
|
|
|
+index 000000000000..199e49cb8d70
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-mei.c
|
|
|
@@ -0,0 +1,282 @@
|
|
@@ -4648,7 +4648,7 @@ index 000000000..199e49cb8
|
|
|
+MODULE_LICENSE("GPL");
|
|
|
diff --git a/drivers/misc/ipts/ipts-msg-handler.c b/drivers/misc/ipts/ipts-msg-handler.c
|
|
|
new file mode 100644
|
|
|
-index 000000000..db5356a1c
|
|
|
+index 000000000000..db5356a1c84e
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-msg-handler.c
|
|
|
@@ -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
|
|
|
new file mode 100644
|
|
|
-index 000000000..f37d9ad9a
|
|
|
+index 000000000000..f37d9ad9af8c
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-msg-handler.h
|
|
|
@@ -0,0 +1,33 @@
|
|
@@ -5130,7 +5130,7 @@ index 000000000..f37d9ad9a
|
|
|
+#endif /* _IPTS_MSG_HANDLER_H */
|
|
|
diff --git a/drivers/misc/ipts/ipts-resource.c b/drivers/misc/ipts/ipts-resource.c
|
|
|
new file mode 100644
|
|
|
-index 000000000..47607ef7c
|
|
|
+index 000000000000..47607ef7c461
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-resource.c
|
|
|
@@ -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
|
|
|
new file mode 100644
|
|
|
-index 000000000..7d66ac72b
|
|
|
+index 000000000000..7d66ac72b475
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-resource.h
|
|
|
@@ -0,0 +1,30 @@
|
|
@@ -5449,7 +5449,7 @@ index 000000000..7d66ac72b
|
|
|
+#endif // _IPTS_RESOURCE_H_
|
|
|
diff --git a/drivers/misc/ipts/ipts-sensor-regs.h b/drivers/misc/ipts/ipts-sensor-regs.h
|
|
|
new file mode 100644
|
|
|
-index 000000000..96812b0eb
|
|
|
+index 000000000000..96812b0eb980
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-sensor-regs.h
|
|
|
@@ -0,0 +1,700 @@
|
|
@@ -6155,7 +6155,7 @@ index 000000000..96812b0eb
|
|
|
+#endif // _TOUCH_SENSOR_REGS_H
|
|
|
diff --git a/drivers/misc/ipts/ipts-state.h b/drivers/misc/ipts/ipts-state.h
|
|
|
new file mode 100644
|
|
|
-index 000000000..39a2eaf5f
|
|
|
+index 000000000000..39a2eaf5f004
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts-state.h
|
|
|
@@ -0,0 +1,29 @@
|
|
@@ -6190,7 +6190,7 @@ index 000000000..39a2eaf5f
|
|
|
+#endif // _IPTS_STATE_H_
|
|
|
diff --git a/drivers/misc/ipts/ipts.h b/drivers/misc/ipts/ipts.h
|
|
|
new file mode 100644
|
|
|
-index 000000000..9c34b55ff
|
|
|
+index 000000000000..9c34b55ff036
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/ipts/ipts.h
|
|
|
@@ -0,0 +1,200 @@
|
|
@@ -6395,7 +6395,7 @@ index 000000000..9c34b55ff
|
|
|
+
|
|
|
+#endif // _IPTS_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
|
|
|
+++ b/drivers/misc/mei/hw-me-regs.h
|
|
|
@@ -119,6 +119,7 @@
|
|
@@ -6407,7 +6407,7 @@ index 225373e4a..828342db0 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 a66ebceea..030e8f429 100644
|
|
|
+index e41f9e0a3fdf..e61be367d7e4 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[] = {
|
|
@@ -6420,7 +6420,7 @@ index a66ebceea..030e8f429 100644
|
|
|
{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
|
|
|
new file mode 100644
|
|
|
-index 000000000..bad44fb4f
|
|
|
+index 000000000000..bad44fb4f233
|
|
|
--- /dev/null
|
|
|
+++ b/include/linux/intel_ipts_if.h
|
|
|
@@ -0,0 +1,76 @@
|