kernel: bump 5.10 to 5.10.173

[openwrt/staging/hauke.git] / target / linux / bcm27xx / patches-5.10 / 950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch

diff --git a/target/linux/bcm27xx/patches-5.10/950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch b/target/linux/bcm27xx/patches-5.10/950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch
index 714977627783533efe7148342e1c21c83b7032c4..9a69254d85aa44a757368a131ff233e81772868b 100644 (file)
--- a/target/linux/bcm27xx/patches-5.10/950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch
@@ -16,7 +16,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -903,6 +903,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -904,6 +904,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
        ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
        if (ret < 0) {
                DRM_ERROR("Failed to retain power domain: %d\n", ret);
@@ -24,7 +24,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                return;
        }
  
-@@ -910,12 +911,14 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -911,12 +912,14 @@ static void vc4_hdmi_encoder_pre_crtc_co
        ret = clk_set_rate(vc4_hdmi->pixel_clock, pixel_rate);
        if (ret) {
                DRM_ERROR("Failed to set pixel clock rate: %d\n", ret);
@@ -39,7 +39,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                return;
        }
  
-@@ -923,6 +926,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -924,6 +927,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
        vc4_hdmi->hsm_req = clk_request_start(vc4_hdmi->hsm_clock, hsm_rate);
        if (IS_ERR(vc4_hdmi->hsm_req)) {
                DRM_ERROR("Failed to set HSM clock rate: %ld\n", PTR_ERR(vc4_hdmi->hsm_req));
@@ -47,7 +47,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                return;
        }
  
-@@ -944,6 +948,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -945,6 +949,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
                clk_request_done(vc4_hdmi->hsm_req);
                clk_disable_unprepare(vc4_hdmi->hsm_clock);
                clk_disable_unprepare(vc4_hdmi->pixel_clock);
@@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                return;
        }
  
-@@ -955,6 +960,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -956,6 +961,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
                clk_request_done(vc4_hdmi->hsm_req);
                clk_disable_unprepare(vc4_hdmi->hsm_clock);
                clk_disable_unprepare(vc4_hdmi->pixel_clock);