kernel: bump 5.10 to 5.10.94

[openwrt/staging/jow.git] / target / linux / bcm27xx / patches-5.10 / 950-0577-vc4-drm-hdmi-Handle-case-when-bvb-clock-is-null.patch

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
index 93f4524a6f0eab5d4b3ffc7893919a8a24c62ca1..aaa67ae4ff7bb8fe879e1c8216efd99ae1e9a03c 100644 (file)
--- 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
@@ -13,7 +13,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -607,7 +607,8 @@ static void vc4_hdmi_encoder_post_crtc_p
+@@ -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);
@@ -23,7 +23,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
        clk_disable_unprepare(vc4_hdmi->hsm_clock);
        clk_request_done(vc4_hdmi->hsm_req);
        clk_disable_unprepare(vc4_hdmi->pixel_clock);
-@@ -931,7 +932,8 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -932,7 +933,8 @@ static void vc4_hdmi_encoder_pre_crtc_co
        else
                bvb_rate = 75000000;
  
@@ -33,7 +33,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
        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);
-@@ -943,7 +945,8 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -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);