Skip to content

Commit 01111df

Browse files
popcornmixpelwell
authored andcommitted
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 4b615cb commit 01111df

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

938938
clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock);
939-
clk_request_done(vc4_hdmi->bvb_req);
939+
if (vc4_hdmi->bvb_req)
940+
clk_request_done(vc4_hdmi->bvb_req);
940941
clk_disable_unprepare(vc4_hdmi->hsm_clock);
941942
clk_request_done(vc4_hdmi->hsm_req);
942943
clk_disable_unprepare(vc4_hdmi->pixel_clock);
@@ -1265,7 +1266,8 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
12651266
else
12661267
bvb_rate = 75000000;
12671268

1268-
vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
1269+
if (vc4_hdmi->pixel_bvb_clock)
1270+
vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
12691271
if (IS_ERR(vc4_hdmi->bvb_req)) {
12701272
DRM_ERROR("Failed to set pixel bvb clock rate: %ld\n", PTR_ERR(vc4_hdmi->bvb_req));
12711273
clk_request_done(vc4_hdmi->hsm_req);
@@ -1277,7 +1279,8 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
12771279
ret = clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
12781280
if (ret) {
12791281
DRM_ERROR("Failed to turn on pixel bvb clock: %d\n", ret);
1280-
clk_request_done(vc4_hdmi->bvb_req);
1282+
if (vc4_hdmi->bvb_req)
1283+
clk_request_done(vc4_hdmi->bvb_req);
12811284
clk_request_done(vc4_hdmi->hsm_req);
12821285
clk_disable_unprepare(vc4_hdmi->hsm_clock);
12831286
clk_disable_unprepare(vc4_hdmi->pixel_clock);

0 commit comments

Comments
 (0)