t2linux/kernel
0
0
Fork 0
mirror of https://github.com/t2linux/kernel.git synced 2026-08-16 05:22:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 9b0d360fd7 which is
commit 20b0dfa86bef0e80b41b0e5ac38b92f23b6f27f9 upstream.

It wasn't applied correctly, something went wrong with an attempt to fix
it up again, so just revert the whole thing to be back at a clean state.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220205171238.GA3073350@roeck-us.net
Reported-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Link: https://lore.kernel.org/r/Yf5lNIJnvhP4ajam@kroah.com
Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>
Cc: Maxime Ripard <maxime@cerno.tech>
Cc: Michael Stapelberg <michael+drm@stapelberg.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2022-02-05 19:22:06 +01:00
parent 920d84d2c7
commit aec5a6ab26
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/vc4/vc4_hdmi.c
+1 -9
View File
@@ -1736,14 +1736,8 @@ 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);
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);
@@ -1889,8 +1883,6 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
if (ret < 0)
goto err_remove_handlers;
pm_runtime_put(&vc4_hdmi->pdev->dev);
return 0;
err_remove_handlers: