| 1 |
commit: d31cb26d558943c7677b45bbe9f5d7787ac7f9ab |
| 2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 5 19:02:14 2022 +0000 |
| 4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 5 19:02:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=d31cb26d |
| 7 |
|
| 8 |
Linux patch 5.16.7 |
| 9 |
|
| 10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
| 11 |
|
| 12 |
0000_README | 4 ++++ |
| 13 |
1006_linux-5.16.7.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 61 insertions(+) |
| 15 |
|
| 16 |
diff --git a/0000_README b/0000_README |
| 17 |
index 0310fc8f..2af50adb 100644 |
| 18 |
--- a/0000_README |
| 19 |
+++ b/0000_README |
| 20 |
@@ -67,6 +67,10 @@ Patch: 1005_linux-5.16.6.patch |
| 21 |
From: http://www.kernel.org |
| 22 |
Desc: Linux 5.16.6 |
| 23 |
|
| 24 |
+Patch: 1006_linux-5.16.7.patch |
| 25 |
+From: http://www.kernel.org |
| 26 |
+Desc: Linux 5.16.7 |
| 27 |
+ |
| 28 |
Patch: 1500_XATTR_USER_PREFIX.patch |
| 29 |
From: https://bugs.gentoo.org/show_bug.cgi?id=470644 |
| 30 |
Desc: Support for namespace user.pax.* on tmpfs. |
| 31 |
|
| 32 |
diff --git a/1006_linux-5.16.7.patch b/1006_linux-5.16.7.patch |
| 33 |
new file mode 100644 |
| 34 |
index 00000000..2b9c7f5f |
| 35 |
--- /dev/null |
| 36 |
+++ b/1006_linux-5.16.7.patch |
| 37 |
@@ -0,0 +1,57 @@ |
| 38 |
+diff --git a/Makefile b/Makefile |
| 39 |
+index 2d7b7fe5cbad6..b642e5650c0b1 100644 |
| 40 |
+--- a/Makefile |
| 41 |
++++ b/Makefile |
| 42 |
+@@ -1,7 +1,7 @@ |
| 43 |
+ # SPDX-License-Identifier: GPL-2.0 |
| 44 |
+ VERSION = 5 |
| 45 |
+ PATCHLEVEL = 16 |
| 46 |
+-SUBLEVEL = 6 |
| 47 |
++SUBLEVEL = 7 |
| 48 |
+ EXTRAVERSION = |
| 49 |
+ NAME = Gobble Gobble |
| 50 |
+ |
| 51 |
+diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c |
| 52 |
+index e6aad838065b9..c000946996edb 100644 |
| 53 |
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c |
| 54 |
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c |
| 55 |
+@@ -1736,21 +1736,15 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) |
| 56 |
+ struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap); |
| 57 |
+ /* clock period in microseconds */ |
| 58 |
+ const u32 usecs = 1000000 / CEC_CLOCK_FREQ; |
| 59 |
+- u32 val; |
| 60 |
+- int ret; |
| 61 |
+- |
| 62 |
+- if (enable) { |
| 63 |
+- ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev); |
| 64 |
+- if (ret) |
| 65 |
+- return ret; |
| 66 |
++ u32 val = HDMI_READ(HDMI_CEC_CNTRL_5); |
| 67 |
+ |
| 68 |
+- val = HDMI_READ(HDMI_CEC_CNTRL_5); |
| 69 |
+- val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET | |
| 70 |
+- VC4_HDMI_CEC_CNT_TO_4700_US_MASK | |
| 71 |
+- VC4_HDMI_CEC_CNT_TO_4500_US_MASK); |
| 72 |
+- val |= ((4700 / usecs) << VC4_HDMI_CEC_CNT_TO_4700_US_SHIFT) | |
| 73 |
+- ((4500 / usecs) << VC4_HDMI_CEC_CNT_TO_4500_US_SHIFT); |
| 74 |
++ val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET | |
| 75 |
++ VC4_HDMI_CEC_CNT_TO_4700_US_MASK | |
| 76 |
++ VC4_HDMI_CEC_CNT_TO_4500_US_MASK); |
| 77 |
++ val |= ((4700 / usecs) << VC4_HDMI_CEC_CNT_TO_4700_US_SHIFT) | |
| 78 |
++ ((4500 / usecs) << VC4_HDMI_CEC_CNT_TO_4500_US_SHIFT); |
| 79 |
+ |
| 80 |
++ if (enable) { |
| 81 |
+ HDMI_WRITE(HDMI_CEC_CNTRL_5, val | |
| 82 |
+ VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); |
| 83 |
+ HDMI_WRITE(HDMI_CEC_CNTRL_5, val); |
| 84 |
+@@ -1778,10 +1772,7 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) |
| 85 |
+ HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, VC4_HDMI_CPU_CEC); |
| 86 |
+ HDMI_WRITE(HDMI_CEC_CNTRL_5, val | |
| 87 |
+ VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); |
| 88 |
+- |
| 89 |
+- pm_runtime_put(&vc4_hdmi->pdev->dev); |
| 90 |
+ } |
| 91 |
+- |
| 92 |
+ return 0; |
| 93 |
+ } |
| 94 |
+ |
Archives