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

updating 4.19 patches to fix touch and suspend

Browse source
This commit is contained in:
Jake Day 2019-01-31 07:14:24 -05:00
parent 5113f28c3d
commit a3a3ed3dc4
11 changed files with 83 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
From 6694d6dfb749b6d9149dd88ec9d6a51fc2d71869 Mon Sep 17 00:00:00 2001
From abc12b08a5ed535d8b90ee872285ac4c2d7900e2 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:45:19 -0500
Date: Thu, 31 Jan 2019 07:10:25 -0500
Subject: [PATCH 01/11] surface-acpi
---

4
patches/4.19/0002-resume-delay.patch
View file

@ -1,6 +1,6 @@
From 2c96c2eabfe092f7b1ada3827737009ee84cb60f Mon Sep 17 00:00:00 2001
From bf9a099e7fb9f6763f2e496ed427c3edff5f4287 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:45:42 -0500
Date: Thu, 31 Jan 2019 07:10:41 -0500
Subject: [PATCH 02/11] resume-delay
---

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

@ -1,6 +1,6 @@
From 8a6ddaf22fc30f97b8d47d40d610671b58158fc7 Mon Sep 17 00:00:00 2001
From af713d0a271a61240e243cee1ddf0041d4f67430 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:51:25 -0500
Date: Thu, 31 Jan 2019 07:10:55 -0500
Subject: [PATCH 03/11] buttons
---

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

@ -1,6 +1,6 @@
From 0c7d455e598ee386ffa5ee877d77943a3259f5d6 Mon Sep 17 00:00:00 2001
From 2579f4b899ab98b1e434bf9485de83300d9b2663 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:51:49 -0500
Date: Thu, 31 Jan 2019 07:11:08 -0500
Subject: [PATCH 04/11] cameras
---
@ -21,10 +21,10 @@ Subject: [PATCH 04/11] cameras
create mode 100644 drivers/staging/ov5693/ov5693.h
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index d46dc432456c..2552fb6fcfbe 100644
index 361abbc00486..d18650bab283 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2352,6 +2352,46 @@ static const struct uvc_device_info uvc_quirk_force_y8 = {
@@ -2357,6 +2357,46 @@ static const struct uvc_device_info uvc_quirk_force_y8 = {
* though they are compliant.
*/
static const struct usb_device_id uvc_ids[] = {

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

@ -1,11 +1,11 @@
From 0ee4cc7146ffaf31332c845ae7242f746d88e0e7 Mon Sep 17 00:00:00 2001
From ffdb2838f469f74fbf2724b9fcd0a65c6cb0ffde Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Mon, 28 Jan 2019 19:24:45 -0500
Subject: [PATCH 5/5] ipts
Date: Thu, 31 Jan 2019 07:11:31 -0500
Subject: [PATCH 05/11] ipts
---
drivers/gpu/drm/i915/Makefile | 3 +
drivers/gpu/drm/i915/i915_drv.c | 7 +
drivers/gpu/drm/i915/i915_drv.c | 13 +
drivers/gpu/drm/i915/i915_drv.h | 3 +
drivers/gpu/drm/i915/i915_gem_context.c | 12 +
drivers/gpu/drm/i915/i915_irq.c | 7 +-
@ -15,8 +15,8 @@ Subject: [PATCH 5/5] ipts
drivers/gpu/drm/i915/intel_guc.h | 1 +
drivers/gpu/drm/i915/intel_guc_submission.c | 89 +-
drivers/gpu/drm/i915/intel_guc_submission.h | 4 +
drivers/gpu/drm/i915/intel_ipts.c | 642 ++++++++++++
drivers/gpu/drm/i915/intel_ipts.h | 34 +
drivers/gpu/drm/i915/intel_ipts.c | 649 ++++++++++++
drivers/gpu/drm/i915/intel_ipts.h | 36 +
drivers/gpu/drm/i915/intel_lrc.c | 12 +-
drivers/gpu/drm/i915/intel_lrc.h | 8 +
drivers/gpu/drm/i915/intel_panel.c | 7 +
@ -45,7 +45,7 @@ Subject: [PATCH 5/5] ipts
drivers/misc/mei/hw-me-regs.h | 1 +
drivers/misc/mei/pci-me.c | 1 +
include/linux/intel_ipts_if.h | 75 ++
41 files changed, 5548 insertions(+), 25 deletions(-)
41 files changed, 5563 insertions(+), 25 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_ipts.c
create mode 100644 drivers/gpu/drm/i915/intel_ipts.h
create mode 100644 drivers/misc/ipts/Kconfig
@ -84,7 +84,7 @@ index 5794f102f9b8..6ae0e91a213a 100644
i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
i915-$(CONFIG_DRM_I915_SELFTEST) += \
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f8cfd16be534..f48122746b6e 100644
index f8cfd16be534..72c2f0fd2c73 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -53,6 +53,7 @@
@ -115,6 +115,26 @@ index f8cfd16be534..f48122746b6e 100644
i915_driver_unregister(dev_priv);
if (i915_gem_suspend(dev_priv))
@@ -1569,6 +1576,9 @@ static int i915_drm_suspend(struct drm_device *dev)
struct pci_dev *pdev = dev_priv->drm.pdev;
pci_power_t opregion_target_state;
+ if (INTEL_GEN(dev_priv) >= 9 && i915_modparams.enable_guc && i915_modparams.enable_ipts)
+ intel_ipts_suspend(dev);
+
disable_rpm_wakeref_asserts(dev_priv);
/* We do a lot of poking in a lot of registers, make sure they work
@@ -1768,6 +1778,9 @@ static int i915_drm_resume(struct drm_device *dev)
enable_rpm_wakeref_asserts(dev_priv);
+ if (INTEL_GEN(dev_priv) >= 9 && i915_modparams.enable_guc && i915_modparams.enable_ipts)
+ intel_ipts_resume(dev);
+
return 0;
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d6c25bea4382..d6b507fb7626 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
@ -398,10 +418,10 @@ 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..1888e450b425
index 000000000000..4a3efea3bac3
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_ipts.c
@@ -0,0 +1,642 @@
@@ -0,0 +1,649 @@
+/*
+ * Copyright 2016 Intel Corporation
+ *
@ -436,9 +456,9 @@ index 000000000000..1888e450b425
+
+#define SUPPORTED_IPTS_INTERFACE_VERSION 1
+
+#define REACQUIRE_DB_THRESHOLD 8
+#define DB_LOST_CHECK_STEP1_INTERVAL 2000 /* ms */
+#define DB_LOST_CHECK_STEP2_INTERVAL 500 /* ms */
+#define REACQUIRE_DB_THRESHOLD 10
+#define DB_LOST_CHECK_STEP1_INTERVAL 2500 /* ms */
+#define DB_LOST_CHECK_STEP2_INTERVAL 1000 /* ms */
+
+/* intel IPTS ctx for ipts support */
+typedef struct intel_ipts {
@ -1007,18 +1027,15 @@ index 000000000000..1888e450b425
+ intel_ipts.dev = dev;
+ INIT_DELAYED_WORK(&intel_ipts.reacquire_db_work, reacquire_db_work_func);
+
+ pr_info("ipts: creating ipts context\n");
+ ret = create_ipts_context();
+ if (ret)
+ return -ENOMEM;
+
+ pr_info("ipts: starting ipts work queue\n");
+ ret = intel_ipts_init_wq();
+ if (ret)
+ return ret;
+
+ intel_ipts.initialized = true;
+ //DRM_DEBUG_DRIVER("Intel iTouch framework initialized\n");
+ pr_info("ipts: Intel iTouch framework initialized\n");
+
+ return ret;
@ -1044,12 +1061,22 @@ index 000000000000..1888e450b425
+ cancel_delayed_work(&intel_ipts.reacquire_db_work);
+ }
+}
+
+int intel_ipts_resume(struct drm_device *dev)
+{
+ return intel_ipts_init(dev);
+}
+
+void intel_ipts_suspend(struct drm_device *dev)
+{
+ intel_ipts_cleanup(dev);
+}
diff --git a/drivers/gpu/drm/i915/intel_ipts.h b/drivers/gpu/drm/i915/intel_ipts.h
new file mode 100644
index 000000000000..a6965d102417
index 000000000000..45d7d1273adf
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_ipts.h
@@ -0,0 +1,34 @@
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2016 Intel Corporation
+ *
@ -1080,6 +1107,8 @@ index 000000000000..a6965d102417
+
+int intel_ipts_init(struct drm_device *dev);
+void intel_ipts_cleanup(struct drm_device *dev);
+int intel_ipts_resume(struct drm_device *dev);
+void intel_ipts_suspend(struct drm_device *dev);
+int intel_ipts_notify_backlight_status(bool backlight_on);
+int intel_ipts_notify_complete(void);
+
@ -6028,7 +6057,7 @@ index 000000000000..1fcd02146b50
+
+#endif // _IPTS_H_
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index e4b10b2d1a08..883b185c9dbe 100644
index 23739a60517f..92a2a0c5947c 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -119,6 +119,7 @@
@ -6040,7 +6069,7 @@ index e4b10b2d1a08..883b185c9dbe 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 ea4e152270a3..4d301ba3f867 100644
index c8e21c894a5f..e26c9280d6ba 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[] = {
@ -6050,7 +6079,7 @@ index ea4e152270a3..4d301ba3f867 100644
+ {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_4, MEI_ME_PCH8_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, MEI_ME_PCH8_SPS_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, MEI_ME_PCH8_SPS_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH8_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
new file mode 100644
index 000000000000..f329bbfb8079

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

@ -1,6 +1,6 @@
From 0ba33cc0e4f65bfc9250027f810e2a78e251bb92 Mon Sep 17 00:00:00 2001
From 7ca1ed7d248ac352163159c884049b33ac3f9db1 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:52:52 -0500
Date: Thu, 31 Jan 2019 07:11:43 -0500
Subject: [PATCH 06/11] hid
---

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

@ -1,6 +1,6 @@
From 9100ebd6198c2db95b041a6ffcca6f8070308aa1 Mon Sep 17 00:00:00 2001
From 998c06863b57818ed29ca9d6cfbbda39c36c2a04 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:53:11 -0500
Date: Thu, 31 Jan 2019 07:11:56 -0500
Subject: [PATCH 07/11] sdcard-reader
---

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

@ -1,6 +1,6 @@
From fc19b38f066347b2acffe213bfe6c96e745698b2 Mon Sep 17 00:00:00 2001
From 6b592ac2fb808cc68d3d7fb65039ce6795636226 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:53:31 -0500
Date: Thu, 31 Jan 2019 07:12:13 -0500
Subject: [PATCH 08/11] wifi
---
@ -11,11 +11,11 @@ Subject: [PATCH 08/11] wifi
drivers/net/wireless/marvell/mwifiex/main.c | 17 +++++++++++++----
drivers/net/wireless/marvell/mwifiex/main.h | 2 ++
drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +++++++++
drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 8 ++++----
drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 2 +-
.../net/wireless/marvell/mwifiex/sta_cmdresp.c | 11 ++++++++---
drivers/net/wireless/marvell/mwifiex/usb.c | 2 ++
scripts/leaking_addresses.pl | 0
11 files changed, 46 insertions(+), 14 deletions(-)
11 files changed, 43 insertions(+), 11 deletions(-)
mode change 100755 => 100644 scripts/leaking_addresses.pl
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
@ -197,38 +197,18 @@ index 3fe81b2a929a..6e734a83e6bf 100644
skb_trim(skb, rx_len);
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 4ed10cf82f9a..f17af83f5669 100644
index 4ed10cf82f9a..3218a8f3d91f 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -2339,7 +2339,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
if (ret)
return -1;
@@ -31,7 +31,7 @@ module_param(drcs, bool, 0644);
MODULE_PARM_DESC(drcs, "multi-channel operation:1, single-channel operation:0");
- if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
+ if (0 && priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
/* Enable IEEE PS by default */
priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
ret = mwifiex_send_cmd(priv,
@@ -2362,8 +2362,8 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
return -1;
}
- mwifiex_send_cmd(priv, HostCmd_CMD_CHAN_REGION_CFG,
- HostCmd_ACT_GEN_GET, 0, NULL, true);
+ //mwifiex_send_cmd(priv, HostCmd_CMD_CHAN_REGION_CFG,
+ // HostCmd_ACT_GEN_GET, 0, NULL, true);
}
/* get tx rate */
@@ -2395,7 +2395,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
if (ret)
return -1;
- if (!disable_auto_ds && first_sta &&
+ if (0 && !disable_auto_ds && first_sta &&
priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
/* Enable auto deep sleep */
auto_ds.auto_ds = DEEP_SLEEP_ON;
static bool disable_auto_ds;
-module_param(disable_auto_ds, bool, 0);
+module_param(disable_auto_ds, bool, 1);
MODULE_PARM_DESC(disable_auto_ds,
"deepsleep enabled=0(default), deepsleep disabled=1");
/*
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index 69e3b624adbb..884bad677cc3 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c

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

@ -1,6 +1,6 @@
From a6204ef155dc2c4ad1fd5bb32e06fd48f43f8572 Mon Sep 17 00:00:00 2001
From 4da845b6d08e9200a2cbc60b1b4b3a22be5da1d3 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:53:53 -0500
Date: Thu, 31 Jan 2019 07:12:28 -0500
Subject: [PATCH 09/11] surface3-power
---

4
patches/4.19/0010-surface-dock.patch
View file

@ -1,6 +1,6 @@
From 9e407a993e67743172e1ad895072fc74b2289f8e Mon Sep 17 00:00:00 2001
From b9220a9addf9cedfb248f1dc722260a7570bee26 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:54:15 -0500
Date: Thu, 31 Jan 2019 07:12:41 -0500
Subject: [PATCH 10/11] surface-dock
---

4
patches/4.19/0011-mwlwifi.patch
View file

@ -1,6 +1,6 @@
From 2a1eb7e8d76dd753663ef0e240ce83b144487ce8 Mon Sep 17 00:00:00 2001
From 833f006fdc664850fa9feeb79d79bc6e6493584a Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 27 Jan 2019 10:54:37 -0500
Date: Thu, 31 Jan 2019 07:12:54 -0500
Subject: [PATCH 11/11] mwlwifi
---