Skip to content

Commit 126af69

Browse files
committed
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 638af2a commit 126af69

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
@@ -1776,6 +1776,11 @@ static int vc4_hdmi_cec_enable(struct cec_adapter *adap)
17761776
/* clock period in microseconds */
17771777
const u32 usecs = 1000000 / CEC_CLOCK_FREQ;
17781778
u32 val = HDMI_READ(HDMI_CEC_CNTRL_5);
1779+
int ret;
1780+
1781+
ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
1782+
if (ret)
1783+
return ret;
17791784

17801785
val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET |
17811786
VC4_HDMI_CEC_CNT_TO_4700_US_MASK |
@@ -1819,6 +1824,8 @@ static int vc4_hdmi_cec_disable(struct cec_adapter *adap)
18191824
HDMI_WRITE(HDMI_CEC_CNTRL_5, HDMI_READ(HDMI_CEC_CNTRL_5) |
18201825
VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
18211826

1827+
pm_runtime_put(&vc4_hdmi->pdev->dev);
1828+
18221829
return 0;
18231830
}
18241831

0 commit comments

Comments
 (0)