Skip to content

Commit b2adb10

Browse files
committed
vc4/drm: hdmi: Handle case when bvb clock is null
Pi2/3 have no bvb clock but want the other clocks to remain enabled here See: #4299 Signed-off-by: Dom Cobley <[email protected]>
1 parent 520f783 commit b2adb10

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/gpu/drm/vc4/vc4_hdmi.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,8 @@ static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder,
930930
HDMI_READ(HDMI_VID_CTL) & ~VC4_HD_VID_CTL_ENABLE);
931931

932932
clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock);
933-
clk_request_done(vc4_hdmi->bvb_req);
933+
if (vc4_hdmi->bvb_req)
934+
clk_request_done(vc4_hdmi->bvb_req);
934935
clk_disable_unprepare(vc4_hdmi->hsm_clock);
935936
clk_request_done(vc4_hdmi->hsm_req);
936937
clk_disable_unprepare(vc4_hdmi->pixel_clock);
@@ -1259,7 +1260,8 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
12591260
else
12601261
bvb_rate = 75000000;
12611262

1262-
vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
1263+
if (vc4_hdmi->pixel_bvb_clock)
1264+
vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
12631265
if (IS_ERR(vc4_hdmi->bvb_req)) {
12641266
DRM_ERROR("Failed to set pixel bvb clock rate: %ld\n", PTR_ERR(vc4_hdmi->bvb_req));
12651267
clk_request_done(vc4_hdmi->hsm_req);
@@ -1271,7 +1273,8 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
12711273
ret = clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
12721274
if (ret) {
12731275
DRM_ERROR("Failed to turn on pixel bvb clock: %d\n", ret);
1274-
clk_request_done(vc4_hdmi->bvb_req);
1276+
if (vc4_hdmi->bvb_req)
1277+
clk_request_done(vc4_hdmi->bvb_req);
12751278
clk_request_done(vc4_hdmi->hsm_req);
12761279
clk_disable_unprepare(vc4_hdmi->hsm_clock);
12771280
clk_disable_unprepare(vc4_hdmi->pixel_clock);

0 commit comments

Comments
 (0)