kernel: bump 5.10 to 5.10.94

[openwrt/staging/chunkeey.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 ec225841b42b3abb88be32e6920c256bcf35fb80..6be52cb43b3cef414f57b3a5a02110f4697570c1 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
-@@ -900,6 +900,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -901,6 +901,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;
        }
  
-@@ -907,12 +908,14 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -908,12 +909,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;
        }
  
-@@ -920,6 +923,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -921,6 +924,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;
        }
  
-@@ -941,6 +945,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -942,6 +946,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;
        }
  
-@@ -952,6 +957,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
+@@ -953,6 +958,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);