Skip to content

Commit 71702c4

Browse files
6by9mripard
authored andcommitted
drm/vc4: hdmi: Don't try disabling SCDC on Pi0-3.
The code that set the scdc_enabled flag to ensure it was disabled at boot time also ran on Pi0-3 where there is no SCDC support. This lead to a warning in vc4_hdmi_encoder_post_crtc_disable due to vc4_hdmi_disable_scrambling being called and trying to read (and write) register HDMI_SCRAMBLER_CTL which doesn't exist on those platforms. Only set the flag should the interface be configured to support more than HDMI 1.4. Fixes: 1998646 ("drm/vc4: hdmi: Introduce a scdc_enabled flag") Signed-off-by: Dave Stevenson <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 3404b39 commit 71702c4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/vc4/vc4_hdmi.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2510,7 +2510,8 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
25102510
* vc4_hdmi_disable_scrambling() will thus run at boot, make
25112511
* sure it's disabled, and avoid any inconsistency.
25122512
*/
2513-
vc4_hdmi->scdc_enabled = true;
2513+
if (variant->max_pixel_clock > HDMI_14_MAX_TMDS_CLK)
2514+
vc4_hdmi->scdc_enabled = true;
25142515

25152516
ret = variant->init_resources(vc4_hdmi);
25162517
if (ret)

0 commit comments

Comments
 (0)