Skip to content

Commit 930737a

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 0614a49 commit 930737a

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
@@ -964,7 +964,8 @@ static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder,
964964
HDMI_READ(HDMI_VID_CTL) & ~VC4_HD_VID_CTL_ENABLE);
965965

966966
clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock);
967-
clk_request_done(vc4_hdmi->bvb_req);
967+
if (vc4_hdmi->bvb_req)
968+
clk_request_done(vc4_hdmi->bvb_req);
968969
clk_disable_unprepare(vc4_hdmi->hsm_clock);
969970
clk_request_done(vc4_hdmi->hsm_req);
970971
clk_disable_unprepare(vc4_hdmi->pixel_clock);
@@ -1286,7 +1287,8 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
12861287
else
12871288
bvb_rate = 75000000;
12881289

1289-
vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
1290+
if (vc4_hdmi->pixel_bvb_clock)
1291+
vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
12901292
if (IS_ERR(vc4_hdmi->bvb_req)) {
12911293
DRM_ERROR("Failed to set pixel bvb clock rate: %ld\n", PTR_ERR(vc4_hdmi->bvb_req));
12921294
clk_request_done(vc4_hdmi->hsm_req);
@@ -1298,7 +1300,8 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
12981300
ret = clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
12991301
if (ret) {
13001302
DRM_ERROR("Failed to turn on pixel bvb clock: %d\n", ret);
1301-
clk_request_done(vc4_hdmi->bvb_req);
1303+
if (vc4_hdmi->bvb_req)
1304+
clk_request_done(vc4_hdmi->bvb_req);
13021305
clk_request_done(vc4_hdmi->hsm_req);
13031306
clk_disable_unprepare(vc4_hdmi->hsm_clock);
13041307
clk_disable_unprepare(vc4_hdmi->pixel_clock);

0 commit comments

Comments
 (0)