Skip to content

Commit ecdd08f

Browse files
mripardpelwell
authored andcommitted
drm/vc4: hdmi: Make sure the device is powered with CEC
Similarly to what we encountered with the detect hook with DRM, nothing actually prevents any of the CEC callback from being run while the HDMI output is disabled. However, this is an issue since any register access to the controller when it's powered down will result in a silent hang. Let's make sure we run the runtime_pm hooks when the CEC adapter is opened and closed by the userspace to avoid that issue. Fixes: 15b4511 ("drm/vc4: add HDMI CEC support") Signed-off-by: Maxime Ripard <[email protected]>
1 parent 9d54011 commit ecdd08f

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/gpu/drm/vc4/vc4_hdmi.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,6 +1780,11 @@ static int vc4_hdmi_cec_enable(struct cec_adapter *adap)
17801780
/* clock period in microseconds */
17811781
const u32 usecs = 1000000 / CEC_CLOCK_FREQ;
17821782
u32 val = HDMI_READ(HDMI_CEC_CNTRL_5);
1783+
int ret;
1784+
1785+
ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
1786+
if (ret)
1787+
return ret;
17831788

17841789
val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET |
17851790
VC4_HDMI_CEC_CNT_TO_4700_US_MASK |
@@ -1823,6 +1828,8 @@ static int vc4_hdmi_cec_disable(struct cec_adapter *adap)
18231828
HDMI_WRITE(HDMI_CEC_CNTRL_5, HDMI_READ(HDMI_CEC_CNTRL_5) |
18241829
VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
18251830

1831+
pm_runtime_put(&vc4_hdmi->pdev->dev);
1832+
18261833
return 0;
18271834
}
18281835

0 commit comments

Comments
 (0)