X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=target%2Flinux%2Fbcm27xx%2Fpatches-5.10%2F950-0577-vc4-drm-hdmi-Handle-case-when-bvb-clock-is-null.patch;fp=target%2Flinux%2Fbcm27xx%2Fpatches-5.10%2F950-0577-vc4-drm-hdmi-Handle-case-when-bvb-clock-is-null.patch;h=0000000000000000000000000000000000000000;hp=aaa67ae4ff7bb8fe879e1c8216efd99ae1e9a03c;hb=d5c4f24b2af991df2ec24df1a3f906049370f59f;hpb=99ad84b6d9727a63f99a16e0b8386747262e3433 diff --git a/target/linux/bcm27xx/patches-5.10/950-0577-vc4-drm-hdmi-Handle-case-when-bvb-clock-is-null.patch b/target/linux/bcm27xx/patches-5.10/950-0577-vc4-drm-hdmi-Handle-case-when-bvb-clock-is-null.patch deleted file mode 100644 index aaa67ae4ff..0000000000 --- a/target/linux/bcm27xx/patches-5.10/950-0577-vc4-drm-hdmi-Handle-case-when-bvb-clock-is-null.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 33e8e066af31c3af1d18d615f5e8ab5e528e0000 Mon Sep 17 00:00:00 2001 -From: Dom Cobley -Date: Wed, 21 Apr 2021 15:15:42 +0100 -Subject: [PATCH] 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: https://github.com/raspberrypi/linux/issues/4299 -Signed-off-by: Dom Cobley ---- - drivers/gpu/drm/vc4/vc4_hdmi.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - ---- a/drivers/gpu/drm/vc4/vc4_hdmi.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -608,7 +608,8 @@ static void vc4_hdmi_encoder_post_crtc_p - HDMI_READ(HDMI_VID_CTL) & ~VC4_HD_VID_CTL_ENABLE); - - clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock); -- clk_request_done(vc4_hdmi->bvb_req); -+ if (vc4_hdmi->bvb_req) -+ clk_request_done(vc4_hdmi->bvb_req); - clk_disable_unprepare(vc4_hdmi->hsm_clock); - clk_request_done(vc4_hdmi->hsm_req); - clk_disable_unprepare(vc4_hdmi->pixel_clock); -@@ -932,7 +933,8 @@ static void vc4_hdmi_encoder_pre_crtc_co - else - bvb_rate = 75000000; - -- vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate); -+ if (vc4_hdmi->pixel_bvb_clock) -+ vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate); - if (IS_ERR(vc4_hdmi->bvb_req)) { - DRM_ERROR("Failed to set pixel bvb clock rate: %ld\n", PTR_ERR(vc4_hdmi->bvb_req)); - clk_request_done(vc4_hdmi->hsm_req); -@@ -944,7 +946,8 @@ static void vc4_hdmi_encoder_pre_crtc_co - ret = clk_prepare_enable(vc4_hdmi->pixel_bvb_clock); - if (ret) { - DRM_ERROR("Failed to turn on pixel bvb clock: %d\n", ret); -- clk_request_done(vc4_hdmi->bvb_req); -+ if (vc4_hdmi->bvb_req) -+ clk_request_done(vc4_hdmi->bvb_req); - clk_request_done(vc4_hdmi->hsm_req); - clk_disable_unprepare(vc4_hdmi->hsm_clock); - clk_disable_unprepare(vc4_hdmi->pixel_clock);