diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2022-02-05 14:04:33 -0500 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2022-02-05 14:04:33 -0500 |
| commit | f0f4c5984ba72fa8546158dbcf334e91aecd2b80 (patch) | |
| tree | 61bda23f399319be1cd1076903364f1c67511faf | |
| parent | Linux patch 5.10.97 (diff) | |
| download | linux-patches-f0f4c598.tar.gz linux-patches-f0f4c598.tar.bz2 linux-patches-f0f4c598.zip | |
Linux patch 5.10.985.10-105
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1097_linux-5.10.98.patch | 57 |
2 files changed, 61 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 20548375..f1c5090c 100644 --- a/0000_README +++ b/0000_README @@ -431,6 +431,10 @@ Patch: 1096_linux-5.10.97.patch From: http://www.kernel.org Desc: Linux 5.10.97 +Patch: 1097_linux-5.10.98.patch +From: http://www.kernel.org +Desc: Linux 5.10.98 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1097_linux-5.10.98.patch b/1097_linux-5.10.98.patch new file mode 100644 index 00000000..f527499c --- /dev/null +++ b/1097_linux-5.10.98.patch @@ -0,0 +1,57 @@ +diff --git a/Makefile b/Makefile +index 9f328bfcaf97d..10827bec74d8f 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 10 +-SUBLEVEL = 97 ++SUBLEVEL = 98 + EXTRAVERSION = + NAME = Dare mighty things + +diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c +index 8eac7dc637b0f..5d5c4e9a86218 100644 +--- a/drivers/gpu/drm/vc4/vc4_hdmi.c ++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +@@ -1399,21 +1399,15 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) + struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap); + /* clock period in microseconds */ + const u32 usecs = 1000000 / CEC_CLOCK_FREQ; +- u32 val; +- int ret; +- +- if (enable) { +- ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev); +- if (ret) +- return ret; ++ u32 val = HDMI_READ(HDMI_CEC_CNTRL_5); + +- val = HDMI_READ(HDMI_CEC_CNTRL_5); +- val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET | +- VC4_HDMI_CEC_CNT_TO_4700_US_MASK | +- VC4_HDMI_CEC_CNT_TO_4500_US_MASK); +- val |= ((4700 / usecs) << VC4_HDMI_CEC_CNT_TO_4700_US_SHIFT) | +- ((4500 / usecs) << VC4_HDMI_CEC_CNT_TO_4500_US_SHIFT); ++ val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET | ++ VC4_HDMI_CEC_CNT_TO_4700_US_MASK | ++ VC4_HDMI_CEC_CNT_TO_4500_US_MASK); ++ val |= ((4700 / usecs) << VC4_HDMI_CEC_CNT_TO_4700_US_SHIFT) | ++ ((4500 / usecs) << VC4_HDMI_CEC_CNT_TO_4500_US_SHIFT); + ++ if (enable) { + HDMI_WRITE(HDMI_CEC_CNTRL_5, val | + VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); + HDMI_WRITE(HDMI_CEC_CNTRL_5, val); +@@ -1439,10 +1433,7 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) + HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, VC4_HDMI_CPU_CEC); + HDMI_WRITE(HDMI_CEC_CNTRL_5, val | + VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); +- +- pm_runtime_put(&vc4_hdmi->pdev->dev); + } +- + return 0; + } + |