android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This is the 5.10.98 stable release

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmH+v+AACgkQONu9yGCS
 aT7KRQ//d6z1KyCbSw2v1SMwaBFYEcwnDIV0+YHfPIGATxnkC0RhJLkinDUf2XeZ
 Sh1oML7tbJI1BsCc/H/e84GhCUYlHNupzAH7cy2VZmUykL9AJmHGTRT7A/FnQ+fY
 Ejsne6EKU7ZiRQSJbKDQAtA9i5WmI7XIGvrTisut3rAzyZS0+vzD03y7B3uK3nc2
 ydSe2S4Ef4aPWy/2NUex3js+/1OkhtR626LV76VSCJw8UBjdsZ3LRNMgW00f0yve
 uqg3j75CjSZlwSQfw9k851mrk27zCyYn7mdg5i9sjgwCqN266e06HRWjFGbBypR0
 /tvp+F+PWpC5g/iYhMB9ia+I2QTa+vzX28K70IA7KNYtCoyRegFEXoFZKstyX/94
 1BEULT/F3obUbjh1zKNivSw0A0gs8J+ULIr3ArjU8MiyCok3dEqw2UDTQiMBBD71
 Eg3bdi9T5V+hLch/QestubPbA2tHncxPhAqMQqNJbnBbEXR/Qircen3SlRG4vEye
 D4bKXRFORKYu/sz5DPKB+vCnQpCLtAF9OGwb/k/1MAXlcYDxYwnsns+GkFlFEqJr
 NF4eZapPvQOdtCF2i5Wq+DMLcWsN9wO8wEFDhWRExByIJ0BQw1Vg+fMx+55Uv81s
 BnSLmTNtfE2SatRa4dlBHv+U/35i4Uiy9wwLt/j+ZsnTlB++Eto=
 =dKNj
 -----END PGP SIGNATURE-----

Merge 5.10.98 into android-5.10

Changes in 5.10.98
	Revert "drm/vc4: hdmi: Make sure the device is powered with CEC"
	Revert "drm/vc4: hdmi: Make sure the device is powered with CEC" again
	Linux 5.10.98

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I94e3aa9a740c14204213dad15dd4e618e68023fd
This commit is contained in:
Greg Kroah-Hartman 2022-02-08 18:13:31 +01:00
commit 08942dae64
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 10
SUBLEVEL = 97
SUBLEVEL = 98
EXTRAVERSION =
NAME = Dare mighty things

23
drivers/gpu/drm/vc4/vc4_hdmi.c
View File

@ -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;
u32 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);
if (enable) {
ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
if (ret)
return ret;
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);
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;
}